Merge "Initialize ro.build.version.preview_sdk" into mnc-dev
This commit is contained in:
commit
0d007cf6d0
3 changed files with 19 additions and 0 deletions
|
@ -205,6 +205,7 @@ endif
|
||||||
BUILD_NUMBER="$(BUILD_NUMBER)" \
|
BUILD_NUMBER="$(BUILD_NUMBER)" \
|
||||||
PLATFORM_VERSION="$(PLATFORM_VERSION)" \
|
PLATFORM_VERSION="$(PLATFORM_VERSION)" \
|
||||||
PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \
|
PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \
|
||||||
|
PLATFORM_PREVIEW_SDK_VERSION="$(PLATFORM_PREVIEW_SDK_VERSION)" \
|
||||||
PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \
|
PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \
|
||||||
PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \
|
PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \
|
||||||
BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \
|
BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \
|
||||||
|
|
|
@ -67,6 +67,23 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
|
||||||
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
|
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"
|
||||||
|
PLATFORM_PREVIEW_SDK_VERSION := 0
|
||||||
|
else
|
||||||
|
ifeq "" "$(PLATFORM_PREVIEW_SDK_VERSION)"
|
||||||
|
# This is the definition of a preview SDK version over and above the current
|
||||||
|
# platform SDK version. Unlike the platform SDK version, a higher value
|
||||||
|
# for preview SDK version does NOT mean that all prior preview APIs are
|
||||||
|
# included. Packages reading this value to determine compatibility with
|
||||||
|
# known APIs should check that this value is precisely equal to the preview
|
||||||
|
# SDK version the package was built for, otherwise it should fall back to
|
||||||
|
# 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 := 1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
|
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
|
||||||
# This is the default minSdkVersion and targetSdkVersion to use for
|
# This is the default minSdkVersion and targetSdkVersion to use for
|
||||||
# all .apks created by the build system. It can be overridden by explicitly
|
# all .apks created by the build system. It can be overridden by explicitly
|
||||||
|
|
|
@ -7,6 +7,7 @@ echo "ro.build.id=$BUILD_ID"
|
||||||
echo "ro.build.display.id=$BUILD_DISPLAY_ID"
|
echo "ro.build.display.id=$BUILD_DISPLAY_ID"
|
||||||
echo "ro.build.version.incremental=$BUILD_NUMBER"
|
echo "ro.build.version.incremental=$BUILD_NUMBER"
|
||||||
echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
|
echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
|
||||||
|
echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION"
|
||||||
echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME"
|
echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME"
|
||||||
echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES"
|
echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES"
|
||||||
echo "ro.build.version.release=$PLATFORM_VERSION"
|
echo "ro.build.version.release=$PLATFORM_VERSION"
|
||||||
|
|
Loading…
Reference in a new issue