From 2b6c204c73b97147ec00484904ee6f4bc003cb15 Mon Sep 17 00:00:00 2001 From: Vijay Venkatraman Date: Wed, 30 Nov 2016 11:13:43 -0800 Subject: [PATCH] Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set. Test: Any module that uses VNDK Change-Id: Ic90b165ade8d9845595f371f410635cae6477d7c --- core/local_vndk.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/core/local_vndk.mk b/core/local_vndk.mk index f81249b26..dd7ba41b9 100644 --- a/core/local_vndk.mk +++ b/core/local_vndk.mk @@ -1,3 +1,16 @@ + +#Set LOCAL_USE_VNDK for modules going into vendor partition +#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK +ifndef LOCAL_SDK_VERSION + ifneq (,$(filter true,$(LOCAL_PROPRIETARY_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE))) + LOCAL_USE_VNDK:=true + else + ifneq (,$(filter $(TARGET_OUT_VENDOR)%,$(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64))) + LOCAL_USE_VNDK:=true + endif + endif +endif + # Verify LOCAL_USE_VNDK usage, and set LOCAL_SDK_VERSION if necessary ifdef LOCAL_IS_HOST_MODULE -- 2.11.0