diff options
| author | 2015-06-29 16:23:34 -0700 | |
|---|---|---|
| committer | 2015-06-29 16:23:34 -0700 | |
| commit | 0b3ac8e60fe44d56054eb37e2441b730f165d605 (patch) | |
| tree | 85cb07bad50bf973aa4e14f4cb4bcfa5c985db34 | |
| parent | 3b0667c1d68ba88c71b031757b757dca659afd69 (diff) | |
Explicitly link libz-host to libart.
A change in system/core/libziparchive will make libziparchive-host
depend on libz-host as a shared library instead of a static library.
As a result, only on MacOS, libziparchive-host will stop re-exporting
libz-host interface. Libart uses both and must link both.
Change-Id: Ie4ae9b27903cbcbdb2d2043969a7fceba32249be
| -rw-r--r-- | runtime/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 5ed6955185..19079cb928 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -478,7 +478,7 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT # For liblog, atrace, properties, ashmem, set_sched_policy and socket_peer_is_trusted. LOCAL_SHARED_LIBRARIES += libcutils else # host - LOCAL_SHARED_LIBRARIES += libziparchive-host + LOCAL_SHARED_LIBRARIES += libziparchive-host libz-host # For ashmem_create_region. LOCAL_SHARED_LIBRARIES += libcutils endif |