Dan Willemsen
9d33c5fdb4
Merge "Support dist-ing the userdatatarball" am: 9abbeb3d8f
...
am: faac87dd9a
Change-Id: If7c93a8c57db6bf6c5a329f3419086d5affe7089
2016-08-17 18:00:07 +00:00
Chih-Hung Hsieh
2be0f9bdbc
Merge "Remove spaces in tidy check list." am: e7bca12466
...
am: 34c8c0ac33
Change-Id: Ibcd65e9fac13f49780ccfb25891d0b26b1e0c4cf
2016-08-17 18:00:07 +00:00
Chih-Hung Hsieh
94a2c5f6b7
Merge "Clarify default tidy check lists."
...
am: ce4c49c2f2
Change-Id: If0641d286d6f1fefa871a18c21282f4fcd10d8a1
2016-08-17 17:48:56 +00:00
Dan Willemsen
faac87dd9a
Merge "Support dist-ing the userdatatarball"
...
am: 9abbeb3d8f
Change-Id: I0dac58c2eed164247fe595da6897ff00f0786e18
2016-08-17 17:48:54 +00:00
Chih-Hung Hsieh
34c8c0ac33
Merge "Remove spaces in tidy check list."
...
am: e7bca12466
Change-Id: I852d42992bc1ddb0a17dd1dcf03cf25f1d114552
2016-08-17 17:48:52 +00:00
Treehugger Robot
ce4c49c2f2
Merge "Clarify default tidy check lists."
2016-08-17 04:56:07 +00:00
Dan Willemsen
9abbeb3d8f
Merge "Support dist-ing the userdatatarball"
2016-08-17 00:58:18 +00:00
Treehugger Robot
e7bca12466
Merge "Remove spaces in tidy check list."
2016-08-17 00:44:50 +00:00
Dan Willemsen
69af2e4102
Support dist-ing the userdatatarball
...
So that we can get to the contents of userdata from the build server
without extracting the image.
Bug: 27719200
Test: m userdatatarball dist
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
2016-08-16 23:41:50 +00:00
Chih-Hung Hsieh
ba646253ce
Remove spaces in tidy check list.
...
This will allow spaces in LOCAL_TIDY_CHECKS.
Bug: http://b/27779618
Change-Id: I6f9b133220e49b2581a06d2fd9083a1d6b7badca
Test: build with WITH_TIDY=1.
2016-08-16 16:27:30 -07:00
Chih-Hung Hsieh
97032ccda3
Clarify default tidy check lists.
...
* Sort all enabled and disabled checks.
* Disable google-default-arguments for external and vendor projects.
Bug: http://b/27779618
Change-Id: I59e6eaf84fddf54bd89eb71a2189d73b64968057
Test: build with WITH_TIDY=1.
2016-08-16 15:47:56 -07:00
Andriy Naborskyy
70ffac9f71
Merge "board-specific prep recovery imagefix recovery size issue" into nyc-mr1-dev am: cface8c009
...
am: 38dccaa82d
Change-Id: I5b6a2075ee22c126b2e79c9c163f20927644a257
2016-08-16 14:15:39 +00:00
Andriy Naborskyy
807729c45b
board-specific prep recovery imagefix recovery size issue am: 5310557e3a
...
am: 7754c958a6
Change-Id: Ie2c88a2bdec4ed483930c9587d7a9eb6e1688664
2016-08-16 14:15:39 +00:00
Andriy Naborskyy
38dccaa82d
Merge "board-specific prep recovery imagefix recovery size issue" into nyc-mr1-dev
...
am: cface8c009
Change-Id: I7a37384fc05a18cd665e90e8578519dbc69f1700
2016-08-16 14:11:20 +00:00
Andriy Naborskyy
7754c958a6
board-specific prep recovery imagefix recovery size issue
...
am: 5310557e3a
Change-Id: I8e1f488a841159cd351f6e9a3d29bd87486ca5a0
2016-08-16 14:11:19 +00:00
Andriy Naborskyy
cface8c009
Merge "board-specific prep recovery imagefix recovery size issue" into nyc-mr1-dev
2016-08-16 14:06:46 +00:00
Android Build Merger (Role)
ad82e3d615
Merge "Adding project path metadata to head_tag.cs am: 594392adec
am: a11558f9cc
am: 3353526f70" into nyc-mr1-dev-plus-aosp
2016-08-16 13:55:04 +00:00
Amanda Kassay
152f2edd3c
Adding project path metadata to head_tag.cs am: 594392adec
...
am: 9ca8e8693c
Change-Id: I7184bf55c6fe843ceb7884472a1460048e4ef8fb
2016-08-16 13:54:49 +00:00
Amanda Kassay
9fa0258ec3
Adding project path metadata to head_tag.cs am: 594392adec
am: a11558f9cc
...
am: 3353526f70
Change-Id: I747775aac3ca85e61c67f4e0207d0fa6908a899b
2016-08-16 13:54:49 +00:00
Amanda Kassay
3353526f70
Adding project path metadata to head_tag.cs am: 594392adec
...
am: a11558f9cc
Change-Id: I0eccc87c4f9c34b1aad9205d7f360a6308a7c9b3
2016-08-16 13:50:49 +00:00
Amanda Kassay
9ca8e8693c
Adding project path metadata to head_tag.cs
...
am: 594392adec
Change-Id: I8b6475e58af84cade97992c1fecb1444d0a13c15
2016-08-16 13:47:43 +00:00
Amanda Kassay
a11558f9cc
Adding project path metadata to head_tag.cs
...
am: 594392adec
Change-Id: Ie7d4912990f8d904cdd4d6633336ad16c2c36dbd
2016-08-16 13:47:09 +00:00
Amanda Kassay
594392adec
Adding project path metadata to head_tag.cs
...
Change-Id: I031e5c1f1c2dd4763c43f0bfde03eb2fa8831472
2016-08-16 13:38:33 +00:00
Dan Willemsen
7d72b5ef71
Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d
am: 9fc9cac0ac
...
am: 0e642c3e55
Change-Id: Ic608a11b5b7ccf78f75bbf4ce7086ed92e1b9e14
2016-08-15 21:26:31 +00:00
Dan Willemsen
0e642c3e55
Merge "Fix GET-INSTALL-PATH to work with Soong" am: 6b9aa6938d
...
am: 9fc9cac0ac
Change-Id: I36aa2dcfca3b0a57c83291d1df07afb50bf3dc92
2016-08-15 21:21:32 +00:00
Dan Willemsen
9fc9cac0ac
Merge "Fix GET-INSTALL-PATH to work with Soong"
...
am: 6b9aa6938d
Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd
2016-08-15 21:17:33 +00:00
Dan Willemsen
6b9aa6938d
Merge "Fix GET-INSTALL-PATH to work with Soong"
2016-08-15 21:07:53 +00:00
Ian Pedowitz
122f2692fb
Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev am: 6dfac06e2c
...
am: d6845667de
Change-Id: I17b0a0a0af4055b8fb2f46cfa06256acfd200120
2016-08-15 17:55:53 +00:00
Ian Pedowitz
5b87d0e41f
N-DR/N-MR1 is 7.1 am: d0528b4463
...
am: 719881f2a0
Change-Id: I8ca090fa86eda9be9be4fc4e17f74fe2cb30e52f
2016-08-15 17:55:49 +00:00
Ian Pedowitz
d6845667de
Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev
...
am: 6dfac06e2c
Change-Id: I356c9ffda1eeb7ea30e7cde331d06aa4d6a37167
2016-08-15 17:48:07 +00:00
Ian Pedowitz
719881f2a0
N-DR/N-MR1 is 7.1
...
am: d0528b4463
Change-Id: I6045d068f33928152b2a50a73678da441249e3f6
2016-08-15 17:47:56 +00:00
Ian Pedowitz
6dfac06e2c
Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev
2016-08-15 17:24:24 +00:00
Adam Seaton
bd4a5b9c05
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
am: afe698d76e
am: 0a3ae2d78d
am: b542d46745
am: 30cae665ea
am: acd497c498
...
am: 822e7b3d86
Change-Id: Ie9892e45399aef7bcb6887d7d0f79f0008856b6c
2016-08-12 23:14:56 +00:00
Tianjie Xu
0ddc4f9cd5
Replace META/care_map.txt when signing target files am: 28375950c2
...
am: 87c36fcb90
Change-Id: I416bb3ca654cba368c861654f30bce40076f1b84
2016-08-12 23:14:54 +00:00
Alex Deymo
bac361558b
Merge changes from topic 'nyc-mr1-ue_sideload_recovery' into nyc-mr1-dev am: cb69ac6c65
...
am: 91707a0be8
Change-Id: I3f8cf76a19c679c84f94110132917b32615c3bbc
2016-08-12 23:06:22 +00:00
Alex Deymo
2d4ee69bc8
Replace OTA sideload verification key when signing A/B devices. am: 95cc84a785
...
am: 38f6f76f05
Change-Id: I6431bb1cc35383bba9df62bc1056f691556fef77
2016-08-12 23:06:16 +00:00
Alex Deymo
ef1a53c180
Install the update-payload-key in the recovery image as well. am: 5134712d6f
...
am: 3f80f566b5
Change-Id: I0e9b9d6c39b230c8f5f2deaa552ee97c6fb20d39
2016-08-12 23:06:10 +00:00
Adam Seaton
822e7b3d86
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
am: afe698d76e
am: 0a3ae2d78d
am: b542d46745
am: 30cae665ea
...
am: acd497c498
Change-Id: I25023a3ae61272b5527005510e7614e33d6a920b
2016-08-12 21:35:48 +00:00
Adam Seaton
858146049d
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
am: afe698d76e
am: 0a3ae2d78d
am: b542d46745
am: 30cae665ea
...
am: 270e40e9f3
Change-Id: I7a090b952344f1c99bbc7e910a25ff651b90b9de
2016-08-12 21:32:47 +00:00
Adam Seaton
270e40e9f3
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
am: afe698d76e
am: 0a3ae2d78d
am: b542d46745
...
am: 30cae665ea
Change-Id: I55cfc39698d8fc30c0e3e00b67e721b3a4e2bd70
2016-08-12 21:28:49 +00:00
Adam Seaton
acd497c498
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
am: afe698d76e
am: 0a3ae2d78d
am: b542d46745
...
am: 30cae665ea
Change-Id: I68291e30fb198c029999bf25cebbd9cfe630d352
2016-08-12 21:28:49 +00:00
Adam Seaton
30cae665ea
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
am: afe698d76e
am: 0a3ae2d78d
...
am: b542d46745
Change-Id: I030d17ffefee2096df8eaf5b9dce72b86a0bca01
2016-08-12 21:25:17 +00:00
Adam Seaton
b542d46745
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
am: afe698d76e
...
am: 0a3ae2d78d
Change-Id: I6d317744f1269b1760d4c12a734e3377033acbd7
2016-08-12 21:21:45 +00:00
Adam Seaton
0a3ae2d78d
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours am: cdbdfcdbd5
...
am: afe698d76e
Change-Id: I8b5cc4ff2992ffe0f229a811076b215b7d0ab0af
2016-08-12 21:18:17 +00:00
Adam Seaton
afe698d76e
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
am: d5c59f3b97
-s ours
...
am: cdbdfcdbd5
Change-Id: Ic0300b3b3018dc08277ddc0398143ae8bcbd0fbc
2016-08-12 21:14:53 +00:00
Adam Seaton
cdbdfcdbd5
Update security string to 2016-09-07 to platform and CTS for September respin am: cc5148493f
am: 637fa9c4c5
am: 5ed4043667
am: 48e00645fe
am: f63dfac0e3
am: a14e8c2f31
...
am: d5c59f3b97
-s ours
Change-Id: Ibcf2cb117de238fa76e0551fd97a12d88200e30d
2016-08-12 21:10:44 +00:00
Tianjie Xu
87c36fcb90
Replace META/care_map.txt when signing target files
...
am: 28375950c2
Change-Id: I893ba2cb5a28f2d7db71ee37b505ea98a18f6719
2016-08-12 20:06:40 +00:00
Tianjie Xu
28375950c2
Replace META/care_map.txt when signing target files
...
Do not copy the "META/care_map.txt" from the source zipfile when
signing the target files with sign_target_files_apks. Because we'll
generate a new care_map after rebuilding the system/vendor images;
and we'll write the new "META/care_map.txt" to the signed-target-file.
Change-Id: I6919cfdf8314a4084b5f612a9c89469f391486a4
Test: Run sign_target_files_apks locally, and the entry is updated.
Bug: 30812253
(cherry picked from commit 4f09900e67
)
2016-08-12 11:35:31 -07:00
Tianjie Xu
b4e4adc195
Merge "Replace META/care_map.txt when signing target files" am: 7b11cacbba
am: bf5e3d168d
...
am: 4f4fb6ce45
Change-Id: If8dd9a34ad92a8d951332376273735573ea8a4c6
2016-08-12 18:13:06 +00:00
Tianjie Xu
4f4fb6ce45
Merge "Replace META/care_map.txt when signing target files" am: 7b11cacbba
...
am: bf5e3d168d
Change-Id: I6476c710a220e2fe91dd06203ee418665ebd1a37
2016-08-12 18:10:07 +00:00