diff options
| author | Zach Jang <zachjang@google.com> | 2015-09-11 17:27:09 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-10-21 11:40:11 -0700 |
| commit | 2064ebcd580df1665834284c867ffb9ea4107607 (patch) | |
| tree | e06f97fa41de1d84bff398ea840168accd5d171c | |
| parent | 5f48454d6e98d147959f1a7b71e97414444dac1c (diff) | |
| download | build-2064ebcd580df1665834284c867ffb9ea4107607.tar.gz | |
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 17 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 2 |
4 files changed, 24 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index e706b9c9e5..e9d4455767 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -314,6 +314,9 @@ $(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/*) +# Added new build props +$(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 15c7f02a6e..82fbbd8a19 100644 --- a/core/Makefile +++ b/core/Makefile @@ -214,6 +214,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_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index cc63286b28..e405b6d1d7 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, @@ -67,6 +68,22 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) 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 := 2015-11-01 +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 "" "$(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 a80b2db47a..d89b934c3e 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -10,6 +10,8 @@ echo "ro.build.version.sdk=$PLATFORM_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" |