Yohann Roussel
c6383d6ec6
Inform Jack of the min sdk
...
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.
Bug: 27371864
Change-Id: I5db233fe09aed0fae37fe9a92658bc8f24b86cdf
2016-03-16 11:55:46 +01:00
Yohann Roussel
962282bde2
Revert "Inform Jack of the min sdk"
...
This reverts commit 94451580af
.
Bug: 27371864
Change-Id: I60a8c89b2ab8a6cbde4dd3b0aed24b71700815ab
2016-03-15 15:02:11 +00:00
Yohann Roussel
94451580af
Inform Jack of the min sdk
...
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.
Bug: 27371864
Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
2016-03-11 11:55:57 +01:00
Zach Jang
a9ac12d276
Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e
am: 53e7d9bf7f
am: c9da4cce57
am: 6c61548bb7
am: 6facd249d5
am: 1b29f2f9c9
...
am: b0b568b5c8
* commit 'b0b568b5c8731e40c53a6bfc3149a3720d1a2570':
Updating security patch string to 2016-03-01
2016-01-12 01:40:37 +00:00
Zach Jang
6c61548bb7
Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e
am: 53e7d9bf7f
...
am: c9da4cce57
* commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc':
Updating security patch string to 2016-03-01
2016-01-12 01:30:53 +00:00
Zach Jang
c9da4cce57
Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e
...
am: 53e7d9bf7f
* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
Updating security patch string to 2016-03-01
2016-01-12 01:28:37 +00:00
Zach Jang
c24c6ccd4d
Updating security patch string to 2016-03-01
...
b/26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2016-01-11 17:12:37 -08:00
Ying Wang
71aaa02533
Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
...
am: e9430e2361
* commit 'e9430e2361d152cae00e779fd055454fc0acf209':
make USER limited to 6 characters when generating BUILD_NUMBER
2015-12-16 21:50:08 +00:00
Ying Wang
e9430e2361
Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
2015-12-16 21:42:07 +00:00
weiqiao
c9219c2c73
make USER limited to 6 characters when generating BUILD_NUMBER
...
BUILD_NUMBER is use to generate ro.build.description and
ro.build.display.id, if USER is long, these properties will
exceed 91 characters easily.
Change-Id: I7f99ef351f80210172a873104edd980b36c3f8f1
Signed-off-by: weiqiao <qiaowei224@gmail.com>
2015-12-16 13:28:21 +08:00
Zach Jang
96c1a8cf01
Update Security String to 2016-02-01 am: f0f73c06e2
am: 5e2b003a11
am: 8b5be4dd4f
am: 1536565dc3
...
am: 61fc840849
* commit '61fc840849a617ddca29189b40169abbc88544f3':
Update Security String to 2016-02-01
2015-12-09 15:09:34 -08:00
Zach Jang
5e2b003a11
Update Security String to 2016-02-01
...
am: f0f73c06e2
* commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57':
Update Security String to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang
929a4abd2b
DO NOT MERGE - Update security string to 2016-02-01
...
b/26110717
Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
2015-12-09 14:45:57 -08:00
Zach Jang
f0f73c06e2
Update Security String to 2016-02-01
...
b/26110717
Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
2015-12-09 20:48:10 +00:00
Zach Jang
c2aae56b82
Update Security String to 2016-01-01 to mnc-dev am: 170459f438
am: bcf2866fb1
am: 3ce70dfe46
am: 10c8949d75
...
am: daf00af42d
* commit 'daf00af42d67098918a0c06b27002255cc5d34de':
Update Security String to 2016-01-01 to mnc-dev
2015-11-21 01:01:48 +00:00
Zach Jang
bcf2866fb1
Update Security String to 2016-01-01 to mnc-dev
...
am: 170459f438
* commit '170459f4385d35dd991549e1b545c376ca8df281':
Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:48:16 +00:00
Zach Jang
170459f438
Update Security String to 2016-01-01 to mnc-dev
...
http://b/25819582
Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
2015-11-20 22:55:19 +00:00
Zach Jang
58cdbdc5ad
Update Security String to 2016-01-01 - DO NOT MERGE
...
http://b/25819582
Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
2015-11-20 22:54:48 +00:00
Bart Sears
1a4deadf34
Revert "Change version back to 6.0" am: 55a149b740
am: 550b317688
...
am: 7b67e0dd73
* commit '7b67e0dd73766dcceb77fa08ae2d8da1341b3c87':
Revert "Change version back to 6.0"
2015-11-15 18:05:17 +00:00
Bart Sears
d30b162002
Change version back to 6.0 am: 970f203b3d
am: 3a37a0cefd
...
am: e373f066fb
* commit 'e373f066fbc4b96fd836d3a6e08e582ece8a0a2d':
Change version back to 6.0
2015-11-15 18:05:09 +00:00
Bart Sears
55a149b740
Revert "Change version back to 6.0"
...
This reverts commit 970f203b3d
.
Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
2015-11-15 17:57:13 +00:00
Bart Sears
970f203b3d
Change version back to 6.0
...
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
2015-11-14 23:50:18 -08:00
Ian Pedowitz
36bf4976bb
Bump Android to 6.0.1 am: 0a20c942c4
am: 1f9ba9f89e
...
am: 4919ed4afc
* commit '4919ed4afc0c289683bfb4932640f6f9b52ed9c7':
Bump Android to 6.0.1
2015-10-22 22:04:15 +00:00
Zach Jang
dca5dd4f79
Update security string to 2015-12-01 am: 0f1512bc03
am: 7b4c7fe5b7
...
am: 5e994e0d9c
* commit '5e994e0d9cb29bbb5e57bb4389086a6e106f6acd':
Update security string to 2015-12-01
2015-10-22 22:04:07 +00:00
Zach Jang
19eec07122
Update security string to 2015-12-01
...
Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
2015-10-22 15:03:14 -07:00
Zach Jang
6575d4a2a8
Update security string to 2015-12-01 - DO NOT MERGE
...
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
2015-10-22 15:00:30 -07:00
Ian Pedowitz
0a20c942c4
Bump Android to 6.0.1
...
Bug: 24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
2015-10-22 21:46:00 +00:00
Zach Jang
0f1512bc03
Update security string to 2015-12-01
...
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
2015-10-19 17:57:33 -07:00
Zach Jang
f414f45e1d
am a78d357d
: am a9b2f303
: am 124a59ae
: Reverting Android Security Patch Level string back to 2015-10-01
...
* commit 'a78d357d185c1bd45e52ad110d59b53540f2949c':
Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:33:27 +00:00
Zach Jang
124a59aecc
Reverting Android Security Patch Level string back to 2015-10-01
...
Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
2015-10-05 18:01:12 -07:00
Zach Jang
80dd5c72a6
am 134b372c
: am 3ab46587
: am 92da6bdb
: am 5e858e3d
: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
...
* commit '134b372c09ad16f9aba154e3a14ff24f11010f7a':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
2015-09-28 21:43:12 +00:00
Zach Jang
1a78a8e7fb
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
...
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
2015-09-21 17:42:49 -07:00
Zach Jang
ab095b445a
am 48e2b43e
: am 47ef4c34
: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
...
* commit '48e2b43e8cc030456b0f625f321c45d2e1775130':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 18:58:10 +00:00
Zach Jang
47ef4c3467
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
...
CL#2/3
b/23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:22:39 +00:00
Zach Jang
ea9ea8fafb
am cf7e78cc
: am 36890dac
: am 9f7c3781
: am 057831bc
: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
...
* commit 'cf7e78cca06b3edc17270eb3bf6715126afd98da':
Set the Security Patch level with Oct 1 for MNC
2015-09-03 04:23:44 +00:00
Zach Jang
4d034675f0
Set the Security Patch level with Oct 1 for MNC
...
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC
Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
2015-08-31 10:12:17 -07:00
Bart Sears
b0eed1a70e
am e23a407b
: am 8239d21b
: am 8a1fa158
: am c69aa42b
: Merge "Set the Security Patch level for MNC" into mnc-dev
...
* commit 'e23a407b2d3153268b81a89d5755d23eb8a483b4':
Set the Security Patch level for MNC
2015-08-26 04:07:19 +00:00
Bart Sears
0bb3145b56
Set the Security Patch level for MNC
...
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.
Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
2015-08-24 23:22:20 -07:00
Dan Willemsen
014719fcfc
resolved conflicts for merge of 05fae7e0
to mnc-dr-dev-plus-aosp
...
Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
2015-08-17 20:44:29 -07:00
Dianne Hackborn
25abc5a38e
Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Dianne Hackborn
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Dan Willemsen
ccc933e97b
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
2015-08-12 00:02:20 -07:00
Dan Willemsen
92026f2d36
Revert "Use repeatable timestamps"
...
OSX `date` doesn't understand -d
This reverts commit 13ba6e00f4
.
Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
2015-08-12 01:00:19 +00:00
Dan Willemsen
13ba6e00f4
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
2015-08-11 17:08:03 -07:00
Ian Pedowitz
a18c5028d7
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
2015-08-11 10:02:15 -07:00
Ian Pedowitz
38ffb0cf89
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
2015-08-11 07:50:04 -07:00
Dianne Hackborn
56866c4d0e
Merge "Remove M codename, version number is 6.0." into mnc-dev
2015-07-31 17:37:50 +00:00
Dianne Hackborn
307631b057
Remove M codename, version number is 6.0.
...
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
2015-07-29 14:22:51 -07:00
Ian Pedowitz
db042bdccd
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
...
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
2015-07-29 10:37:24 -07:00
Dianne Hackborn
a42551685f
Raise API level to 23.
...
Now apps can target both MNC and 23.
Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
2015-06-26 15:54:10 -07:00