Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" am: 54b437286b am: e131ab1e10

Original change: https://android-review.googlesource.com/c/platform/build/+/1721370

Change-Id: I8ad39eb7f2ab075f60d03eb123392dc0488d9f72
This commit is contained in:
Colin Cross
2021-06-01 22:27:44 +00:00
committed by Automerger Merge Worker

View File

@@ -229,7 +229,7 @@ endif
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_SDK_VERSION)
else
PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_VERSION_CODENAME)
PLATFORM_SYSTEMSDK_VERSIONS += $(subst $(comma),$(space),$(PLATFORM_VERSION_ALL_CODENAMES))
endif
PLATFORM_SYSTEMSDK_VERSIONS := $(strip $(sort $(PLATFORM_SYSTEMSDK_VERSIONS)))
.KATI_READONLY := PLATFORM_SYSTEMSDK_VERSIONS