commit 08f945de653f421dead12572d8c6aabca3399018
author Justin Yun <justinyun@google.com> Wed Feb 14 14:29:32 2018 +0900
committer Justin Yun <justinyun@google.com> Wed Feb 14 14:29:32 2018 +0900
tree fa4bd261253582d90412b9392ce7c9f769c6edba
parent bc747cc3b99f29f9e7ae328da11e850e0f53259b

Remove libz from vndk-sp list for non-VNDK-enforced devices

libz is llndk for non-VNDK-enforced devices to pass the
android.jni.cts test.

Bug: 73296261
Test: run android.jni.cts test
Change-Id: I931b4da2bbf0e46330f968ef33626064b89cb08b

vndk/Android.mk

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 @@
     $(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))))