Merge "master is now P" into stage-aosp-master
This commit is contained in:
commit
3bb60f4c6e
1 changed files with 2 additions and 6 deletions
|
@ -38,8 +38,8 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
|
|||
include $(INTERNAL_BUILD_ID_MAKEFILE)
|
||||
endif
|
||||
|
||||
DEFAULT_PLATFORM_VERSION := OPD1
|
||||
MIN_PLATFORM_VERSION := OPD1
|
||||
DEFAULT_PLATFORM_VERSION := PPR1
|
||||
MIN_PLATFORM_VERSION := PPR1
|
||||
MAX_PLATFORM_VERSION := PPR1
|
||||
|
||||
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
|
||||
|
@ -79,14 +79,10 @@ endif
|
|||
# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
|
||||
# please add that PLATFORM_VERSION to the following text file:
|
||||
# cts/tests/tests/os/assets/platform_versions.txt
|
||||
PLATFORM_VERSION.OPD1 := 8.0.1
|
||||
PLATFORM_VERSION.OPM1 := OMR1
|
||||
PLATFORM_VERSION.PPR1 := P
|
||||
|
||||
# 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.OPD1 := REL
|
||||
PLATFORM_VERSION_CODENAME.OPM1 := OMR1
|
||||
PLATFORM_VERSION_CODENAME.PPR1 := P
|
||||
|
||||
ifndef PLATFORM_VERSION
|
||||
|
|
Loading…
Reference in a new issue