StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add P back to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-03 01:11:06 +00:00
committed by Android (Google) Code Review
parent 1fc5b81fd2 e13a588aa6
commit b97c97b643
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/version_defaults.mk
View File

@@ -38,9 +38,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
include $(INTERNAL_BUILD_ID_MAKEFILE) include $(INTERNAL_BUILD_ID_MAKEFILE)
endif endif
DEFAULT_PLATFORM_VERSION := OPM1 DEFAULT_PLATFORM_VERSION := PPR1
MIN_PLATFORM_VERSION := OPM1 MIN_PLATFORM_VERSION := PPR1
MAX_PLATFORM_VERSION := OPM1 MAX_PLATFORM_VERSION := PPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\ ALLOWED_VERSIONS := $(call allowed-platform-versions,\
$(MIN_PLATFORM_VERSION),\ $(MIN_PLATFORM_VERSION),\
@@ -74,11 +74,11 @@ endif
# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's # please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's
# in the following text file: # in the following text file:
# cts/tests/tests/os/assets/platform_versions.txt # cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_VERSION.OPM1 := 8.1.0 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.OPM1 := REL PLATFORM_VERSION_CODENAME.PPR1 := P
ifndef PLATFORM_VERSION ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION)) PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))