openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Ensure that BOARD_VNDK_VERSION is current" am: 4ef5040cc3 am: a71a8c0ae3 

am: 5148a458a2

Change-Id: I6c953a8085f7f33a84b99c1ad5359a8bf8cb8921
This commit is contained in:
Dan Willemsen 2017-03-29 04:45:05 +00:00 committed by android-build-merger
parent 99a995157b 5148a458a2
commit 51ad7f244e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/binary.mk
View File

@ -112,12 +112,12 @@ ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)
# that for the generated libraries. Clip the API level to the minimum where # that for the generated libraries. Clip the API level to the minimum where
# appropriate. # appropriate.
ifdef LOCAL_USE_VNDK ifdef LOCAL_USE_VNDK
my_ndk_api := $(BOARD_VNDK_VERSION) my_ndk_api := current
else else
my_ndk_api := $(LOCAL_SDK_VERSION) my_ndk_api := $(LOCAL_SDK_VERSION)
endif ifneq ($(my_ndk_api),current)
ifneq ($(my_ndk_api),current)
my_ndk_api := $(call math_max,$(my_ndk_api),$(my_min_sdk_version)) my_ndk_api := $(call math_max,$(my_ndk_api),$(my_min_sdk_version))
endif
endif endif
my_ndk_api_def := $(my_ndk_api) my_ndk_api_def := $(my_ndk_api)

7
core/envsetup.mk
View File

@ -259,6 +259,13 @@ ifeq ($(AB_OTA_UPDATER),true)
endif endif
endif endif
# Check BOARD_VNDK_VERSION
ifdef BOARD_VNDK_VERSION
ifneq ($(BOARD_VNDK_VERSION),current)
$(error BOARD_VNDK_VERSION: Only "current" is implemented)
endif
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Set up configuration for target machine. # Set up configuration for target machine.
# The following must be set: # The following must be set: