pa-fazil
/
android_build
mirror of https://github.com/fazilsheik96/android_build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "master is now OPD1/ODR by default and adding OPM1/OMR1"" 

This reverts commit d9c3fd1d55.

Bug: 37201939
Fixes: 37212091
Change-Id: I7894321971c0b696594deb064ebed3f43cf7c8d1
This commit is contained in:
Ian Pedowitz 2017-04-18 23:25:01 +00:00 committed by Colin Cross
parent b105e365c7
commit 0a06d8ba79
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/version_defaults.mk
View File

@ -38,8 +38,8 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
include $(INTERNAL_BUILD_ID_MAKEFILE)
endif
DEFAULT_PLATFORM_VERSION := OPR1
MIN_PLATFORM_VERSION := OPR1
DEFAULT_PLATFORM_VERSION := OPD1
MIN_PLATFORM_VERSION := OPD1
MAX_PLATFORM_VERSION := PPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
@ -79,11 +79,15 @@ 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.OPR1 := O
PLATFORM_VERSION.OPD1 := ODR
PLATFORM_VERSION.OPM1 := OMR1
PLATFORM_VERSION.PPR1 := P
# These are the current development codenames.
# 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.OPR1 := O
PLATFORM_VERSION_CODENAME.OPD1 := ODR
PLATFORM_VERSION_CODENAME.OPM1 := OMR1
PLATFORM_VERSION_CODENAME.PPR1 := P
ifndef PLATFORM_VERSION
@ -164,7 +168,7 @@ else
# assuming the device can only support APIs as of the previous official
# public release.
# This value will always be 0 for release builds.
PLATFORM_PREVIEW_SDK_VERSION := 2
PLATFORM_PREVIEW_SDK_VERSION := 1
endif
endif