diff options
| author | Zach Jang <zachjang@google.com> | 2015-09-17 20:16:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-17 20:16:43 +0000 |
| commit | e539537d8c7a4288f40afa9226787b9af3d4416b (patch) | |
| tree | b34f1492308aac5d8e7ab3487e472aca3da9d4c6 | |
| parent | f7cb5fc2b1c38e7b12c1bb9ae348e048be3d2eeb (diff) | |
| parent | 7f96f4f6b95de53bd4aaff762885050ad7c4a7be (diff) | |
| download | build-e539537d8c7a4288f40afa9226787b9af3d4416b.zip build-e539537d8c7a4288f40afa9226787b9af3d4416b.tar.gz build-e539537d8c7a4288f40afa9226787b9af3d4416b.tar.bz2 | |
am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
| -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 744a862..4f0459e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -221,6 +221,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 642c7e3..bcb1b53 100644 --- a/core/Makefile +++ b/core/Makefile @@ -181,6 +181,8 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 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)" \ BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d5b1e62..d3834c0 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, @@ -62,6 +63,22 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" PLATFORM_VERSION_CODENAME := REL 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 e3fe99c..b755710 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -9,6 +9,8 @@ echo "ro.build.version.incremental=$BUILD_NUMBER" echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME" 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" |