diff options
| author | 2016-12-15 21:26:16 +0000 | |
|---|---|---|
| committer | 2016-12-15 21:26:16 +0000 | |
| commit | b777f169f89436eae4b06fa35272b0183dfa81c3 (patch) | |
| tree | f2807d052d775c0d7b64fcefc6a6f60e3783c1e0 | |
| parent | b8888197c657cdda23327d4c0a865234bbca22a6 (diff) | |
| parent | 2b6c204c73b97147ec00484904ee6f4bc003cb15 (diff) | |
Merge "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."
| -rw-r--r-- | core/local_vndk.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/local_vndk.mk b/core/local_vndk.mk index f81249b26c..dd7ba41b9c 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 |