From 45efdc4e0ea636b8cb9af4fd70a670026b1a677f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 27 May 2021 13:26:07 -0700
Subject: [PATCH] Support all active codenames for BOARD_SYSTEMSDK_VERSIONS

Use PLATFORM_VERSION_ALL_CODENAMES to construct PLATFORM_SYSTEMSDK_VERSIONS
so that both S and T are accepted while T is active but S is not finalized.

Bug: 186121492
Test: treehugger
Change-Id: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 181ea62814..f32ea761be 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -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