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

Merge "Ensure that BOARD_VNDK_VERSION is current" into oc-dev

This commit is contained in:
TreeHugger Robot 2017-04-05 22:42:16 +00:00 committed by Android (Google) Code Review
parent 87bbe36728 2af509ba3d
commit 8a6d7fabc3
2 changed files with 10 additions and 3 deletions

4
core/binary.mk
View File

@ -112,13 +112,13 @@ 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)
my_ndk_hist_api := $(my_ndk_api) my_ndk_hist_api := $(my_ndk_api)

7
core/envsetup.mk
View File

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