commit 909436eefdbdfb67e29ce43283dbc029d7b57a35
author Orion Hodson <oth@google.com> Thu Apr 18 09:34:45 2019 +0100
committer Orion Hodson <oth@google.com> Thu Apr 18 10:59:20 2019 +0000
tree c3e51197b0035b9b2a029ac554da22c2741f8d60
parent 13ac9bcda8b1a8910dd58c9de5a55a9ef581f387

Use static linking for dexdump on host builds

Fixes breakage with static_sdk_tools.

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

(cherry picked from commit a6c7b888ba62b7d6bf0517281e14537c48cee0d3)

Merged-In: Ie5aa4b3e24c3e4740baa8b218d75f6616bd7a994
Change-Id: Ie5aa4b3e24c3e4740baa8b218d75f6616bd7a994

dexdump/Android.bp

diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index c1890da..c817858 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,23 +48,6 @@
                 "libziparchive",
             ],
         },
-        not_windows: {
-            shared_libs: [
-                "libdexfile",
-                "libartbase",
-                "libbase",
-            ],
-        },
-        android: {
-            shared_libs: [
-                "libdexfile",
-                "libartbase",
-                "libbase",
-            ],
-        },
-        darwin: {
-            enabled: true,
-        },
     }
 }