Merge "Adding Q entries to version_defaults.mk"

This commit is contained in:
android-build-prod (mdb)
2018-05-02 15:27:50 +00:00
committed by Gerrit Code Review

View File

@@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
include $(INTERNAL_BUILD_ID_MAKEFILE)
endif
DEFAULT_PLATFORM_VERSION := PPR1
MIN_PLATFORM_VERSION := PPR1
MAX_PLATFORM_VERSION := PPR1
DEFAULT_PLATFORM_VERSION := QPR1
MIN_PLATFORM_VERSION := QPR1
MAX_PLATFORM_VERSION := QPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
$(MIN_PLATFORM_VERSION),\
@@ -83,10 +83,12 @@ MAX_PLATFORM_VERSION :=
# in the following text file:
# cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_VERSION.PPR1 := P
PLATFORM_VERSION.QPR1 := Q
# 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.PPR1 := P
PLATFORM_VERSION_CODENAME.QPR1 := Q
ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))