tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "master is now P" into stage-aosp-master

Browse source
This commit is contained in:
TreeHugger Robot 2017-10-18 02:03:43 +00:00 committed by Android (Google) Code Review
commit 3bb60f4c6e
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/version_defaults.mk
View file

@ -38,8 +38,8 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
include $(INTERNAL_BUILD_ID_MAKEFILE) include $(INTERNAL_BUILD_ID_MAKEFILE)
endif endif
DEFAULT_PLATFORM_VERSION := OPD1 DEFAULT_PLATFORM_VERSION := PPR1
MIN_PLATFORM_VERSION := OPD1 MIN_PLATFORM_VERSION := PPR1
MAX_PLATFORM_VERSION := PPR1 MAX_PLATFORM_VERSION := PPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\ ALLOWED_VERSIONS := $(call allowed-platform-versions,\
@ -79,14 +79,10 @@ endif
# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION # When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
# please add that PLATFORM_VERSION to the following text file: # please add that PLATFORM_VERSION to the following text file:
# cts/tests/tests/os/assets/platform_versions.txt # cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_VERSION.OPD1 := 8.0.1
PLATFORM_VERSION.OPM1 := OMR1
PLATFORM_VERSION.PPR1 := P PLATFORM_VERSION.PPR1 := P
# These are the current development codenames, if the build is not a final # 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". # release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME.OPD1 := REL
PLATFORM_VERSION_CODENAME.OPM1 := OMR1
PLATFORM_VERSION_CODENAME.PPR1 := P PLATFORM_VERSION_CODENAME.PPR1 := P
ifndef PLATFORM_VERSION ifndef PLATFORM_VERSION