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

Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset" into main am: 7968bc4f39

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2897500

Change-Id: Ie583f473f4ff1bd3a2f5056a107a0232e250a037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-04 18:31:04 +00:00
committed by Automerger Merge Worker
parent 48f7b3201d 7968bc4f39
commit fdb1137a95
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config.mk
View File

@@ -831,16 +831,12 @@ endif
# Set BOARD_SYSTEMSDK_VERSIONS to the latest SystemSDK version starting from P-launching # Set BOARD_SYSTEMSDK_VERSIONS to the latest SystemSDK version starting from P-launching
# devices if unset. # devices if unset.
ifndef BOARD_SYSTEMSDK_VERSIONS 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)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))
BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_SDK_VERSION) BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_SDK_VERSION)
else else
BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_VERSION_CODENAME) BOARD_SYSTEMSDK_VERSIONS := $(PLATFORM_VERSION_CODENAME)
endif endif
endif endif
endif
endif
ifndef BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES ifndef BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES
BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES := current BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES := current