p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve merge conflicts of be9844a03c to oc-dev-plus-aosp 

Change-Id: If7d78718d8f6349b9b386c30096bd83d8f94cbc9
This commit is contained in:
Ian Pedowitz 2017-05-15 21:01:59 -07:00
parent e44086e272 be9844a03c
commit 611c95a3f8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/version_defaults.mk
View File

@ -79,10 +79,11 @@ 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.OPR1 := O PLATFORM_VERSION.OPR1 := 8.0.0
# These are the current development codenames. # This is the current development code-name, if the build is not a final
PLATFORM_VERSION_CODENAME.OPR1 := O # release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME.OPR1 := REL
ifndef PLATFORM_VERSION ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION)) PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
@ -162,7 +163,7 @@ else
# assuming the device can only support APIs as of the previous official # assuming the device can only support APIs as of the previous official
# public release. # public release.
# This value will always be 0 for release builds. # This value will always be 0 for release builds.
PLATFORM_PREVIEW_SDK_VERSION := 2 PLATFORM_PREVIEW_SDK_VERSION := 0
endif endif
endif endif