p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__"

This commit is contained in:
Justin Yun 2021-03-18 23:33:43 +00:00 committed by Gerrit Code Review
parent c63bf0ad7a 69f7191d5d
commit 25dc5ea096
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/binary.mk
View File

@ -311,6 +311,15 @@ ifneq ($(LOCAL_USE_VNDK),)
my_api_level := $(call codename-or-sdk-to-sdk,$(BOARD_VNDK_VERSION))
endif
my_cflags += -D__ANDROID_VNDK__
ifneq ($(LOCAL_USE_VNDK_VENDOR),)
# Vendor modules have LOCAL_USE_VNDK_VENDOR when
# BOARD_VNDK_VERSION is defined.
my_cflags += -D__ANDROID_VENDOR__
else ifneq ($(LOCAL_USE_VNDK_PRODUCT),)
# Product modules have LOCAL_USE_VNDK_PRODUCT when
# PRODUCT_PRODUCT_VNDK_VERSION is defined.
my_cflags += -D__ANDROID_PRODUCT__
endif
endif
ifndef LOCAL_IS_HOST_MODULE

2
core/local_vndk.mk
View File

@ -5,6 +5,7 @@ ifndef LOCAL_IS_HOST_MODULE
ifndef LOCAL_SDK_VERSION
ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))
LOCAL_USE_VNDK:=true
LOCAL_USE_VNDK_VENDOR:=true
# Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already
# set correctly before this is included.
endif
@ -40,6 +41,7 @@ ifdef LOCAL_USE_VNDK
# If we're not using the VNDK, drop all restrictions
ifndef BOARD_VNDK_VERSION
LOCAL_USE_VNDK:=
LOCAL_USE_VNDK_VENDOR:=
LOCAL_USE_VNDK_PRODUCT:=
endif
endif