StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings

Browse Source 
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
This commit is contained in:
Zach Jang
2015-09-11 17:27:09 -07:00
parent 289c9563e3
commit 4c710cbe7f
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CleanSpec.mk
View File

@@ -217,6 +217,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# 4.4.4 # 4.4.4
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# 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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

2
core/Makefile
View File

@@ -181,6 +181,8 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $(
BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \
BUILD_NUMBER="$(BUILD_NUMBER)" \ BUILD_NUMBER="$(BUILD_NUMBER)" \
PLATFORM_VERSION="$(PLATFORM_VERSION)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \
PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \
PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \
PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \
PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \
BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \ BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

17
core/version_defaults.mk
View File

@@ -24,6 +24,7 @@
# DEFAULT_APP_TARGET_SDK # DEFAULT_APP_TARGET_SDK
# BUILD_ID # BUILD_ID
# BUILD_NUMBER # BUILD_NUMBER
# SECURITY_PATCH
# #
# Look for an optional file containing overrides of the defaults, # Look for an optional file containing overrides of the defaults,
@@ -62,6 +63,22 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
PLATFORM_VERSION_CODENAME := REL PLATFORM_VERSION_CODENAME := REL
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 := 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)" ifeq "" "$(DEFAULT_APP_TARGET_SDK)"
# This is the default minSdkVersion and targetSdkVersion to use for # This is the default minSdkVersion and targetSdkVersion to use for
# all .apks created by the build system. It can be overridden by explicitly # all .apks created by the build system. It can be overridden by explicitly

2
tools/buildinfo.sh
View File

@@ -9,6 +9,8 @@ echo "ro.build.version.incremental=$BUILD_NUMBER"
echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION"
echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME" echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME"
echo "ro.build.version.release=$PLATFORM_VERSION" 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=`date`"
echo "ro.build.date.utc=`date +%s`" echo "ro.build.date.utc=`date +%s`"
echo "ro.build.type=$TARGET_BUILD_TYPE" echo "ro.build.type=$TARGET_BUILD_TYPE"