Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b161297d authored by Zach Jang's avatar Zach Jang Committed by Android Git Automerger
Browse files

am ab095b44: am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 -... 

am ab095b44: am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit 'ab095b44':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
parents 2c9dfb82 ab095b44

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

# ************************************************

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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)" \

core/version_defaults.mk

+17 −0
Original line number Diff line number Diff line
@@ -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

tools/buildinfo.sh

+2 −0
Original line number Diff line number Diff line
@@ -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"