summaryrefslogtreecommitdiff
path: root/dexdump/Android.bp
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2019-04-18 09:34:45 +0100
committer David Sehr <sehr@google.com> 2019-04-18 18:38:16 -0700
commit520a43637b12d68d16b41d5e1aa5b253fe1e8625 (patch)
treecd97eefc196db01842522a8b82c79f6e8d8fe540 /dexdump/Android.bp
parent063c9851f87ee6cb7b25ffce55300a2153b40766 (diff)
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
Diffstat (limited to 'dexdump/Android.bp')
-rw-r--r--dexdump/Android.bp25
1 files changed, 10 insertions, 15 deletions
diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index c1890da5c0..c8b2ce5595 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -27,30 +27,25 @@ 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: {