diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 12:02:30 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 12:02:30 -0800 |
| commit | 62366951c46777315d8e711e7c292278113a832d (patch) | |
| tree | 168a553e5fa7b89e2ad711118fcaed8fc6022183 | |
| parent | c5ac5475738b6e74692c731c5ed9aa22d80915ca (diff) | |
| parent | c3c1d432d3df98ed71da643ad3bee557106d6890 (diff) | |
| download | build-62366951c46777315d8e711e7c292278113a832d.zip build-62366951c46777315d8e711e7c292278113a832d.tar.gz build-62366951c46777315d8e711e7c292278113a832d.tar.bz2 | |
Merge tag 'android-6.0.1_r74' into HEAD
CYNGNOS-3303
Android 6.0.1 release 74
Change-Id: Ie96480de0df00e2d4c7d298f53e4f102aad5c823
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index e6bb0d7..8928324 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30X +export BUILD_ID=MOB31K diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 558a035..03b9011 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -100,10 +100,12 @@ 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 := 2016-10-05 + # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. + # It must be of the form "YYYY-MM-DD" on production devices. + # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. + # + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. + PLATFORM_SECURITY_PATCH := 2016-11-05 endif ifeq "" "$(PLATFORM_BASE_OS)" |