diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-13 00:54:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 00:54:30 +0000 |
| commit | 897f3ba8b1cc402fca16720be345ba9c587c326b (patch) | |
| tree | d232cd6546825b3d320988a1f88f2b63a8d9b38f /core | |
| parent | 0fd879cd65f1c53c409142ca90744b1d43bdbc08 (diff) | |
| parent | 25abc5a38e2e7f2962463aa4e5cd407ecdde689c (diff) | |
| download | build-897f3ba8b1cc402fca16720be345ba9c587c326b.zip build-897f3ba8b1cc402fca16720be345ba9c587c326b.tar.gz build-897f3ba8b1cc402fca16720be345ba9c587c326b.tar.bz2 | |
am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #23116383: Include security patch level in Settings
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index ae1bf57..888d01f 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 efb2bee..483c8f2 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 |