From 43d98dc805378b9a71a2044300f836bb2df94bb3 Mon Sep 17 00:00:00 2001 From: Bill Rassieur Date: Wed, 10 Apr 2019 09:53:02 -0700 Subject: [PATCH] Master is now designated for R. Update MAX_PLATFORM_VERSION, etc. Bug: 128934651 Test: treehugger Change-Id: I352e02484fa73ee924c84846913b93f7713c77ef Merged-In: I352e02484fa73ee924c84846913b93f7713c77ef --- core/version_defaults.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a392924d2..b248fd3d4 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE include $(INTERNAL_BUILD_ID_MAKEFILE) endif -DEFAULT_PLATFORM_VERSION := QP1A -MIN_PLATFORM_VERSION := QP1A -MAX_PLATFORM_VERSION := QP1A +DEFAULT_PLATFORM_VERSION := RP1A +MIN_PLATFORM_VERSION := RP1A +MAX_PLATFORM_VERSION := RP1A ALLOWED_VERSIONS := $(call allowed-platform-versions,\ $(MIN_PLATFORM_VERSION),\ @@ -82,11 +82,20 @@ MAX_PLATFORM_VERSION := # please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's # in the following text file: # cts/tests/tests/os/assets/platform_versions.txt + +# Note that there should be one PLATFORM_VERSION and PLATFORM_VERSION_CODENAME +# entry for each unreleased API level, regardless of +# MIN_PLATFORM_VERSION/MAX_PLATFORM_VERSION. PLATFORM_VERSION is used to +# generate the range of allowed SDK versions, so it must have an entry for every +# unreleased API level targetable by this branch, not just those that are valid +# lunch targets for this branch. PLATFORM_VERSION.QP1A := Q +PLATFORM_VERSION.RP1A := R # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". PLATFORM_VERSION_CODENAME.QP1A := Q +PLATFORM_VERSION_CODENAME.RP1A := R ifndef PLATFORM_VERSION PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))