diff options
| author | Justin Yun <justinyun@google.com> | 2018-02-14 09:39:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-14 09:39:48 +0000 |
| commit | a27f8c3561d2cc4d2c2fa69207e2035bc7465acd (patch) | |
| tree | fa4bd261253582d90412b9392ce7c9f769c6edba | |
| parent | f4714b6d4d9b745bc82cf49dd27e835fb5db77fe (diff) | |
| parent | 7e472f08ae5afdb01bc8176d90085a5f5ec1c161 (diff) | |
| download | common-a27f8c3561d2cc4d2c2fa69207e2035bc7465acd.tar.gz | |
Merge "Remove libz from vndk-sp list for non-VNDK-enforced devices" am: e20a58f574
am: 7e472f08ae
Change-Id: I3620f1cd1e00e6f4895c65a4abc993936cf5ea67
| -rw-r--r-- | vndk/Android.mk | 3 |
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)))) |