aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Yun <justinyun@google.com>2018-02-14 09:33:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-14 09:33:48 +0000
commit7e472f08ae5afdb01bc8176d90085a5f5ec1c161 (patch)
treefa4bd261253582d90412b9392ce7c9f769c6edba
parentce446544563c00a18b44c8660a451e0b1c7e2997 (diff)
parente20a58f574d0a69f175d1d0c88ec982df4725b4e (diff)
downloadcommon-7e472f08ae5afdb01bc8176d90085a5f5ec1c161.tar.gz
Merge "Remove libz from vndk-sp list for non-VNDK-enforced devices"
am: e20a58f574 Change-Id: Ia518ac832c57ea2b73102be836c23086ce297b00
-rw-r--r--vndk/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/vndk/Android.mk b/vndk/Android.mk
index 48a72f4..36c218c 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -52,6 +52,9 @@ $(foreach lib,$(VNDK_SAMEPROCESS_LIBRARIES),\
$(if $(filter $(lib),$(VNDK_SP_LIBRARIES)),,\
$(eval VNDK_SP_LIBRARIES += $(lib))))
+# Remove libz from the VNDK-SP list (b/73296261)
+VNDK_SP_LIBRARIES := $(filter-out libz,$(VNDK_SP_LIBRARIES))
+
$(foreach lib,$(VNDK_SP_LIBRARIES),\
$(eval $(call define-vndk-sp-lib,$(lib))))