From ed42f62df5bb46168334dadecb5d143c38f7a88b Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Thu, 18 Apr 2019 09:34:45 +0100
Subject: 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 | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'dexdump/Android.bp')

diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index c1890da5c0..c817858677 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -27,35 +27,27 @@ art_cc_binary {
     defaults: ["dexdump_defaults"],
     host_supported: true,
     target: {
-        windows: {
-            enabled: true,
-            static_libs: [
-                "libdexfile",
-                "libartbase",
-                "libbase",
-                "libartpalette",
-                "liblog",
-                "libz",
-                "libziparchive",
-            ],
-        },
-        not_windows: {
+        android: {
             shared_libs: [
                 "libdexfile",
                 "libartbase",
                 "libbase",
             ],
         },
-        android: {
-            shared_libs: [
+        // Use static libs on host: required for Windows build and
+        // static_sdk_tools build.
+        host: {
+            enabled: true,
+            static_libs: [
                 "libdexfile",
                 "libartbase",
                 "libbase",
+                "libartpalette",
+                "liblog",
+                "libz",
+                "libziparchive",
             ],
         },
-        darwin: {
-            enabled: true,
-        },
     }
 }
 
-- 
cgit v1.2.3-59-g8ed1b