aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-02-14 09:26:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-02-14 09:26:42 +0000
commite20a58f574d0a69f175d1d0c88ec982df4725b4e (patch)
treefa4bd261253582d90412b9392ce7c9f769c6edba
parentbc747cc3b99f29f9e7ae328da11e850e0f53259b (diff)
parent08f945de653f421dead12572d8c6aabca3399018 (diff)
downloadcommon-e20a58f574d0a69f175d1d0c88ec982df4725b4e.tar.gz
Merge "Remove libz from vndk-sp list for non-VNDK-enforced devices"
-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))))