diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-12 16:11:20 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-08-12 16:29:08 -0700 |
| commit | e593e5c42a30aabb92fd2762e647a1024ca5d823 (patch) | |
| tree | fdfceba01e4d910a26dfe93946961b637b01386d | |
| parent | 38ffb0cf899d94cb72409519bd25dc94048dd719 (diff) | |
| download | build-e593e5c42a30aabb92fd2762e647a1024ca5d823.zip build-e593e5c42a30aabb92fd2762e647a1024ca5d823.tar.gz build-e593e5c42a30aabb92fd2762e647a1024ca5d823.tar.bz2 | |
Fix issie #23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 17 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 2 |
4 files changed, 23 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7778118..64d84e3 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -369,6 +369,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/Makefile b/core/Makefile index 7da3b23..22dcee1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -204,6 +204,8 @@ endif BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_NUMBER="$(BUILD_NUMBER)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \ + PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \ + PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ PLATFORM_PREVIEW_SDK_VERSION="$(PLATFORM_PREVIEW_SDK_VERSION)" \ PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 25dfcdc..c75e3a5 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -24,6 +24,7 @@ # DEFAULT_APP_TARGET_SDK # BUILD_ID # BUILD_NUMBER +# SECURITY_PATCH # # Look for an optional file containing overrides of the defaults, @@ -97,6 +98,22 @@ ifeq "" "$(DEFAULT_APP_TARGET_SDK)" endif endif +ifeq "" "$(PLATFORM_SECURITY_PATCH)" + # Used to indicate the security patch that has been applied to the device. + # Can be an arbitrary string, but must be a single word. + # + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. + PLATFORM_SECURITY_PATCH := +endif + +ifeq "" "$(PLATFORM_BASE_OS)" + # Used to indicate the base os applied to the device. + # Can be an arbitrary string, but must be a single word. + # + # If there is no $PLATFORM_BASE_OS set, keep it empty. + PLATFORM_BASE_OS := +endif + ifeq "" "$(BUILD_ID)" # Used to signify special builds. E.g., branches and/or releases, # like "M5-RC7". Can be an arbitrary string, but must be a single diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 6cd9499..5c199b8 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -11,6 +11,8 @@ 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" +echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH" +echo "ro.build.version.base_os=$PLATFORM_BASE_OS" echo "ro.build.date=`date`" echo "ro.build.date.utc=`date +%s`" echo "ro.build.type=$TARGET_BUILD_TYPE" |