From 08f945de653f421dead12572d8c6aabca3399018 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 14 Feb 2018 14:29:32 +0900 Subject: 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 | 3 +++ 1 file changed, 3 insertions(+) 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)))) -- cgit v1.2.3