From 0fa0052583d56e75ab53e742fd57cd67b2cda9ef Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 12 Apr 2018 17:10:05 +0900 Subject: [PATCH] Allow native:vendor to vendor apks Vendor apks should be able to reference native vendor libraries. Vendor apks have worked around this by building without LOCAL_SDK_VERSION, which then allowed to use all libs. However, since vendor apks now needs to be built with SystemSDK, that workaround can no longer be used. Bug: 76398918 Test: BOARD_SYSTEMSDK_VERSION=P m -j Merged-In: Idb13d5db71f4dfd542658483b6a24e7ece18ce26 Change-Id: Idb13d5db71f4dfd542658483b6a24e7ece18ce26 (cherry picked from commit 49a5b9785f6b1cede8bc31f5d3c60cfe91738eff) --- core/install_jni_libs_internal.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk index ab5fd2ced..a99d88ad7 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -109,6 +109,9 @@ ifneq ($(LOCAL_SDK_VERSION),) my_link_type := app:sdk my_warn_types := native:platform $(my_warn_ndk_types) my_allowed_types := $(my_allowed_ndk_types) + ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE))) + my_allowed_types += native:vendor native:vndk + endif else my_link_type := app:platform my_warn_types := $(my_warn_ndk_types)