commit 1356209410467474db5886a495b00f431e79abfb
author Justin Yun <justinyun@google.com> Wed Feb 14 14:18:10 2018 +0900
committer Justin Yun <justinyun@google.com> Wed Feb 14 07:34:55 2018 +0000
tree c7c59ec5626fb996c16f7b73a7c7ddb082398c6b
parent e1d203a3ea7e908a6ebf57dfc96baf30912d6177

Remove libz from vndk-sp list for marlin/sailfish

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

Bug: 73296261
Test: run android.jni.cts test on marlin/sailfish
Change-Id: I566d4b57a567d6845672a6eb96d3ec5bd75cdfc7
Merged-In: I566d4b57a567d6845672a6eb96d3ec5bd75cdfc7

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 7d71fd0..05c1592 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -76,3 +76,7 @@
 # Remove /system/lib[64]/vndk-sp/android.hardware.graphics.allocator@2.0.so
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/android.hardware.graphics.allocator@2.0.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-sp/android.hardware.graphics.allocator@2.0.so)
+
+# Remove /system/lib[64]/vndk-sp/libz.so
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp/libz.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-sp/libz.so)

vndk/Android.mk

diff --git a/vndk/Android.mk b/vndk/Android.mk
index eb1e048..85e51e3 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -50,6 +50,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))))