Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset" into main
This commit is contained in:
@@ -831,14 +831,10 @@ endif
|
||||
# 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
|
||||
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
|
||||
BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_SDK_VERSION)
|
||||
else
|
||||
BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_VERSION_CODENAME)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
Reference in New Issue
Block a user