diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-30 11:19:14 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-30 11:19:14 -0700 |
| commit | 872dd8208f00c667af8d9e0fd07fdd0ada56d437 (patch) | |
| tree | 2f69282f19c72ef157dad9fdc7b6c6daf8a1bf38 /runtime/Android.mk | |
| parent | af62cf99a1a4320157e1074c1e65c5fbb0320349 (diff) | |
| download | art-872dd8208f00c667af8d9e0fd07fdd0ada56d437.tar.gz art-872dd8208f00c667af8d9e0fd07fdd0ada56d437.tar.bz2 art-872dd8208f00c667af8d9e0fd07fdd0ada56d437.zip | |
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 'runtime/Android.mk')
| -rw-r--r-- | runtime/Android.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 6f6dcbcb6c..a2fc24a21c 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -457,15 +457,21 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_C_INCLUDES += $$(ART_C_INCLUDES) LOCAL_C_INCLUDES += art/sigchainlib - LOCAL_SHARED_LIBRARIES += liblog libnativehelper libnativebridge + LOCAL_SHARED_LIBRARIES := libnativehelper libnativebridge libsigchain include external/libcxx/libcxx.mk LOCAL_SHARED_LIBRARIES += libbacktrace_libc++ ifeq ($$(art_target_or_host),target) - LOCAL_SHARED_LIBRARIES += libcutils libdl libutils libsigchain + LOCAL_SHARED_LIBRARIES += libdl + # ZipArchive support, the order matters here to get all symbols. LOCAL_STATIC_LIBRARIES := libziparchive libz + # For android::FileMap used by libziparchive. + LOCAL_SHARED_LIBRARIES += libutils + # For liblog, atrace, properties, ashmem, set_sched_policy and socket_peer_is_trusted. + LOCAL_SHARED_LIBRARIES += libcutils else # host - LOCAL_STATIC_LIBRARIES += libcutils libziparchive-host libz libutils - LOCAL_SHARED_LIBRARIES += libsigchain + LOCAL_SHARED_LIBRARIES += libziparchive-host + # For ashmem_create_region. + LOCAL_STATIC_LIBRARIES += libcutils endif ifeq ($$(ART_USE_PORTABLE_COMPILER),true) include $$(LLVM_GEN_INTRINSICS_MK) |