From eb2e568df2f56a147170b2de16e169441747fcb0 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 19 Jul 2017 10:33:02 +0900 Subject: [PATCH] Apks are again allowed to use vendor libs as before When BOARD_VNDK_VERSION is set, native libs that were labeled as native:platform are now divided into native:platform and native:vendor sets depending on their install locations. In order to keep the existing apks to use all the libraries that they have been using, native:vendor is also added to the allowed types for apks. However, in the future when we have vendor SDK and enforce all vendor apks to use the vendor SDK, we will disallow native:vendor to app:platform and native:vendor will be allowed only to those vendor apks (probably labeled as app:vendor). Bug: 33241851 Test: BOARD_VNDK_VERSION=current m (e.g. ModemDiagnosticSystem in internal master) Change-Id: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b Merged-In: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b --- core/install_jni_libs_internal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk index 0e9215366..b5f10cfab 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -116,7 +116,7 @@ my_allowed_types := native:ndk else my_link_type := app:platform my_warn_types := -my_allowed_types := native:ndk native:platform +my_allowed_types := native:ndk native:platform native:vendor endif my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))