diff options
| author | Adam Powell <adamp@google.com> | 2015-05-21 22:17:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 22:17:41 +0000 |
| commit | 0d007cf6d0294e7372d387a773f78ad60add5f6f (patch) | |
| tree | 126cbaefe5b2523c567e62d380b31edf63c924ff | |
| parent | 7451df690c74731f022c244b229ecdd2f2b45f57 (diff) | |
| parent | bdd5e8e7fe6afb14c9b3028fdaa094008ada309c (diff) | |
| download | build-0d007cf6d0294e7372d387a773f78ad60add5f6f.zip build-0d007cf6d0294e7372d387a773f78ad60add5f6f.tar.gz build-0d007cf6d0294e7372d387a773f78ad60add5f6f.tar.bz2 | |
Merge "Initialize ro.build.version.preview_sdk" into mnc-dev
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 17 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index b5cb727..0528b44 100644 --- a/core/Makefile +++ b/core/Makefile @@ -205,6 +205,7 @@ endif BUILD_NUMBER="$(BUILD_NUMBER)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ + PLATFORM_PREVIEW_SDK_VERSION="$(PLATFORM_PREVIEW_SDK_VERSION)" \ PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \ BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d325fd3..6cbe81c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -67,6 +67,23 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) 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)" # This is the default minSdkVersion and targetSdkVersion to use for # all .apks created by the build system. It can be overridden by explicitly diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index dcd9ab5..6cd9499 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -7,6 +7,7 @@ echo "ro.build.id=$BUILD_ID" echo "ro.build.display.id=$BUILD_DISPLAY_ID" echo "ro.build.version.incremental=$BUILD_NUMBER" 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.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES" echo "ro.build.version.release=$PLATFORM_VERSION" |