StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure that BOARD_VNDK_VERSION is current"

Browse Source 
am: 4ef5040cc3

Change-Id: I79f43fa6db5f043122fc17c2d89c03bfc0690494
This commit is contained in:
Dan Willemsen
2017-03-29 04:40:05 +00:00
committed by android-build-merger
parent e611741d85 4ef5040cc3
commit a71a8c0ae3
2 changed files with 10 additions and 3 deletions
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

@@ -254,6 +254,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: