Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot 2017-09-06 23:46:48 +00:00 committed by Android (Google) Code Review
commit 418b291486

View file

@ -78,7 +78,7 @@ PLATFORM_VERSION.OPM1 := 8.1.0
# 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 := OMR1 PLATFORM_VERSION_CODENAME.OPM1 := REL
ifndef PLATFORM_VERSION ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION)) PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
@ -158,7 +158,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 := 1 PLATFORM_PREVIEW_SDK_VERSION := 0
endif endif
endif endif