From 569b9e08fa2b27b16edc6474d678fd438f0311b1 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Mon, 22 Jan 2024 21:23:54 +0000 Subject: [PATCH] Move RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES out to release configs. We have more known codenames then we are releasing, and need a way to override this in release configs. Bug: 307733231 Test: m nothing Ignore-AOSP-First: Changes in internal projects first. Change-Id: I2215dc449ca28cae253f514183507550b58f267b Merged-In: I2215dc449ca28cae253f514183507550b58f267b --- core/version_util.mk | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/core/version_util.mk b/core/version_util.mk index dfa0277993..cae87aa942 100644 --- a/core/version_util.mk +++ b/core/version_util.mk @@ -31,6 +31,7 @@ # PLATFORM_VNDK_VERSION # PLATFORM_SYSTEMSDK_VERSIONS # PLATFORM_VERSION_LAST_STABLE +# PLATFORM_VERSION_KNOWN_CODENAMES # # Look for an optional file containing overrides of the defaults, @@ -95,17 +96,10 @@ endif PLATFORM_VERSION_LAST_STABLE := $(RELEASE_PLATFORM_VERSION_LAST_STABLE) .KATI_READONLY := PLATFORM_VERSION_LAST_STABLE - -# This are all known codenames. Should this move into the release config? -PLATFORM_VERSION_KNOWN_CODENAMES := \ -Base Base11 Cupcake Donut Eclair Eclair01 EclairMr1 Froyo Gingerbread GingerbreadMr1 \ -Honeycomb HoneycombMr1 HoneycombMr2 IceCreamSandwich IceCreamSandwichMr1 \ -JellyBean JellyBeanMr1 JellyBeanMr2 Kitkat KitkatWatch Lollipop LollipopMr1 M N NMr1 O OMr1 P \ -Q R S Sv2 Tiramisu UpsideDownCake VanillaIceCream - -# Convert from space separated list to comma separated -PLATFORM_VERSION_KNOWN_CODENAMES := \ - $(call normalize-comma-list,$(PLATFORM_VERSION_KNOWN_CODENAMES)) +ifdef PLATFORM_VERSION_KNOWN_CODENAMES + $(error Do not set PLATFORM_VERSION_KNOWN_CODENAMES directly. Use RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES. value: $(PLATFORM_VERSION_KNOWN_CODENAMES)) +endif +PLATFORM_VERSION_KNOWN_CODENAMES := $(RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES) .KATI_READONLY := PLATFORM_VERSION_KNOWN_CODENAMES ifndef PLATFORM_VERSION