Merge "Set BOARD_SYSTEMSDK_VERSIONS automatically for P-launching device" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-04-24 00:50:47 +00:00
committed by Android (Google) Code Review

View File

@@ -840,6 +840,21 @@ $(KATI_obsolete_var PRODUCT_USE_VNDK_OVERRIDE,Use PRODUCT_USE_VNDK instead)
.KATI_READONLY := \
PRODUCT_USE_VNDK
# Set BOARD_SYSTEMSDK_VERSIONS to the latest SystemSDK version starting from P-launching
# devices if unset.
ifndef BOARD_SYSTEMSDK_VERSIONS
ifdef PRODUCT_SHIPPING_API_LEVEL
ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),28),)
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_SDK_VERSION)
else
BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_VERSION_CODENAME)
endif
endif
endif
endif
ifdef PRODUCT_SHIPPING_API_LEVEL
ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),27),)
ifneq ($(TARGET_USES_MKE2FS),true)