summaryrefslogtreecommitdiffstats
path: root/disassembler
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-10-30 11:19:14 -0700
committerIan Rogers <irogers@google.com>2014-10-30 11:19:14 -0700
commit872dd8208f00c667af8d9e0fd07fdd0ada56d437 (patch)
tree2f69282f19c72ef157dad9fdc7b6c6daf8a1bf38 /disassembler
parentaf62cf99a1a4320157e1074c1e65c5fbb0320349 (diff)
downloadart-872dd8208f00c667af8d9e0fd07fdd0ada56d437.zip
art-872dd8208f00c667af8d9e0fd07fdd0ada56d437.tar.gz
art-872dd8208f00c667af8d9e0fd07fdd0ada56d437.tar.bz2
Tidy and reduce ART library dependencies on the host.
Move to shared rather than static libraries. Avoids capture of all static libraries library dependencies. Change-Id: I2be96e92dad4ed1842d76b044745f2a2e15372eb
Diffstat (limited to 'disassembler')
-rw-r--r--disassembler/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk
index eb3b024..f2dd1ee 100644
--- a/disassembler/Android.mk
+++ b/disassembler/Android.mk
@@ -84,11 +84,11 @@ define build-libart-disassembler
LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
include external/libcxx/libcxx.mk
+ # For disassembler_arm64.
+ LOCAL_SHARED_LIBRARIES += libvixl
ifeq ($$(art_target_or_host),target)
- LOCAL_SHARED_LIBRARIES += libcutils libvixl
include $(BUILD_SHARED_LIBRARY)
else # host
- LOCAL_STATIC_LIBRARIES += libcutils libvixl
include $(BUILD_HOST_SHARED_LIBRARY)
endif
endef