commit 520a43637b12d68d16b41d5e1aa5b253fe1e8625
author Orion Hodson <oth@google.com> Thu Apr 18 09:34:45 2019 +0100
committer David Sehr <sehr@google.com> Thu Apr 18 18:38:16 2019 -0700
tree cd97eefc196db01842522a8b82c79f6e8d8fe540
parent 063c9851f87ee6cb7b25ffce55300a2153b40766

Use static linking for dexdump on host builds

Fix applied to enable darwin build, which failed on the previous
version.

Bug: 22322814
Test: make -j80 static_sdk_tools dist BUILD_HOST_static=1

Change-Id: I4c50c3623b777c17e2cca5452acca23530bfd96e

dexdump/Android.bp

diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index c1890da..c8b2ce5 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -27,7 +27,16 @@
     defaults: ["dexdump_defaults"],
     host_supported: true,
     target: {
-        windows: {
+        android: {
+            shared_libs: [
+                "libdexfile",
+                "libartbase",
+                "libbase",
+            ],
+        },
+        // Use static libs on host: required for Windows build and
+        // static_sdk_tools build.
+        host: {
             enabled: true,
             static_libs: [
                 "libdexfile",
@@ -39,20 +48,6 @@
                 "libziparchive",
             ],
         },
-        not_windows: {
-            shared_libs: [
-                "libdexfile",
-                "libartbase",
-                "libbase",
-            ],
-        },
-        android: {
-            shared_libs: [
-                "libdexfile",
-                "libartbase",
-                "libbase",
-            ],
-        },
         darwin: {
             enabled: true,
         },