diff options
| author | 2015-06-30 22:19:13 +0000 | |
|---|---|---|
| committer | 2015-06-30 22:19:17 +0000 | |
| commit | 371496daf03921c0c3ade8bc20b33b6454d8d495 (patch) | |
| tree | ccedbe42b3d721e74d72babe01bb4ffe8784f27c | |
| parent | 053df00e1d27e658f016f4ff6d5a822861555e6a (diff) | |
| parent | 0b3ac8e60fe44d56054eb37e2441b730f165d605 (diff) | |
Merge "Explicitly link libz-host to libart."
| -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 |