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

Merge "Specialize oc-dev into OPR1" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-08 02:05:22 +00:00
committed by Android (Google) Code Review
parent 1fe4f23a04 096aaeee16
commit b70a93465a
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/version_defaults.mk
View File

@@ -40,7 +40,7 @@ endif
DEFAULT_PLATFORM_VERSION := OPR1 DEFAULT_PLATFORM_VERSION := OPR1
MIN_PLATFORM_VERSION := OPR1 MIN_PLATFORM_VERSION := OPR1
MAX_PLATFORM_VERSION := PPR1 MAX_PLATFORM_VERSION := OPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\ ALLOWED_VERSIONS := $(call allowed-platform-versions,\
$(MIN_PLATFORM_VERSION),\ $(MIN_PLATFORM_VERSION),\
@@ -74,12 +74,10 @@ endif
# 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.OPR1 := O PLATFORM_VERSION.OPR1 := O
PLATFORM_VERSION.PPR1 := P
# This is the current development code-name, if the build is not a final # This is the current development code-name, 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.OPR1 := O PLATFORM_VERSION_CODENAME.OPR1 := O
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))