diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-13 00:46:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 00:46:58 +0000 |
| commit | 25abc5a38e2e7f2962463aa4e5cd407ecdde689c (patch) | |
| tree | 7f25026a79f76db498e9f91443611148ab195097 /core/version_defaults.mk | |
| parent | a0372e20a24283002c2d27b372194d88e1983a3f (diff) | |
| parent | e593e5c42a30aabb92fd2762e647a1024ca5d823 (diff) | |
| download | build-25abc5a38e2e7f2962463aa4e5cd407ecdde689c.zip build-25abc5a38e2e7f2962463aa4e5cd407ecdde689c.tar.gz build-25abc5a38e2e7f2962463aa4e5cd407ecdde689c.tar.bz2 | |
Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
Diffstat (limited to 'core/version_defaults.mk')
| -rw-r--r-- | core/version_defaults.mk | 17 |
1 files changed, 17 insertions, 0 deletions
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 |