Merge "Revert "Revert "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."""
This commit is contained in:
commit
0c29ffb74d
1 changed files with 15 additions and 0 deletions
|
@ -1,3 +1,18 @@
|
||||||
|
|
||||||
|
#Set LOCAL_USE_VNDK for modules going into vendor partition, except for host modules
|
||||||
|
#If LOCAL_SDK_VERSION is set, thats a more restrictive set, so they dont need LOCAL_USE_VNDK
|
||||||
|
ifndef LOCAL_IS_HOST_MODULE
|
||||||
|
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
|
||||||
|
endif
|
||||||
|
|
||||||
# Verify LOCAL_USE_VNDK usage, and set LOCAL_SDK_VERSION if necessary
|
# Verify LOCAL_USE_VNDK usage, and set LOCAL_SDK_VERSION if necessary
|
||||||
|
|
||||||
ifdef LOCAL_IS_HOST_MODULE
|
ifdef LOCAL_IS_HOST_MODULE
|
||||||
|
|
Loading…
Reference in a new issue