| Revisión | 48a3fe41b600d51319b91578c136d6a4dfe8aabf (tree) |
|---|---|
| Tiempo | 2017-01-10 13:38:36 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-6.0.1_r74' into marshmallow-x86
Android 6.0.1 release 74
core/build_id.mk (diff) core/version_defaults.mk (diff)| @@ -18,4 +18,4 @@ | ||
| 18 | 18 | # (like "CRB01"). It must be a single word, and is |
| 19 | 19 | # capitalized by convention. |
| 20 | 20 | |
| 21 | -export BUILD_ID=MOB31E | |
| 21 | +export BUILD_ID=MOB31K |
| @@ -100,10 +100,12 @@ endif | ||
| 100 | 100 | |
| 101 | 101 | ifeq "" "$(PLATFORM_SECURITY_PATCH)" |
| 102 | 102 | # Used to indicate the security patch that has been applied to the device. |
| 103 | - # Can be an arbitrary string, but must be a single word. | |
| 104 | - # | |
| 105 | - # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. | |
| 106 | - PLATFORM_SECURITY_PATCH := 2016-09-06 | |
| 103 | + # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. | |
| 104 | + # It must be of the form "YYYY-MM-DD" on production devices. | |
| 105 | + # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. | |
| 106 | + # | |
| 107 | + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. | |
| 108 | + PLATFORM_SECURITY_PATCH := 2016-11-05 | |
| 107 | 109 | endif |
| 108 | 110 | |
| 109 | 111 | ifeq "" "$(PLATFORM_BASE_OS)" |
Android-x86
Fork