Commit graph

28669 commits

Author SHA1 Message Date
Alex Deymo
5134712d6f Install the update-payload-key in the recovery image as well.
The update-payload-key is required to verify the contents of the OTA in
recovery while sideloading an update.

Bug: 27178350
TEST=`make` builds a boot.img with the payload key in recovery.

(cherry picked from commit c6ebe9fcd7)

Change-Id: I0128d7f684d32201e227acce798b25f12982eaaa
2016-08-10 11:10:11 -07:00
TreeHugger Robot
9b9520018b Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev 2016-08-09 20:51:33 +00:00
Nick Desaulniers
d491fcf438 build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT
Bug: 30681215
Change-Id: Ic3a18a65f9b1251c2592fc54569b2c6af99e6ece
2016-08-09 12:29:26 -07:00
Adam Seaton
143faf4aa4 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1
am: 2d033a9e51

Change-Id: Iacc3e198cff56bdd396a64e594d19e4ca635c3e4
2016-08-09 00:11:11 +00:00
Adam Seaton
2d033a9e51 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5
am: f7de14b8a1

Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde
2016-08-09 00:05:36 +00:00
Adam Seaton
f7de14b8a1 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2
am: 68870731a5

Change-Id: I3e302e74d090485c179381a085d39d17bc212d67
2016-08-08 23:57:05 +00:00
Adam Seaton
68870731a5 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
am: e158db8ad2

Change-Id: I61ddf7619069a6dc3bb10a70c6eca4d55a33c3fe
2016-08-08 23:54:05 +00:00
Adam Seaton
e158db8ad2 Update Security String to 2016-09-07 to platform and CTS for September respin
am: a53b868e6e

Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
2016-08-08 23:48:10 +00:00
Adam Seaton
a53b868e6e Update Security String to 2016-09-07 to platform and CTS for September
respin

Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
2016-08-08 15:08:45 -07:00
Dan Willemsen
dc1ddfcf3c Allow prebuilt APKs to specify LOCAL_INSTALLED_MODULE_STEM
We've got a case where two different prebuilt APKs need to have the same
apk name (but using a different LOCAL_MODULE_PATH).

Bug: 30470308
Change-Id: I5551e720d173623daa757c4c0aabc8e1a423ac38
2016-08-05 17:26:28 -07:00
Joe Fernandez
2de8d0dba8 docs: Add TOC template logic for ARC docs am: accb6660a5
am: 9d606e0082

Change-Id: I99c246c017544d7639cc110eb02b4f2d5fd07865
2016-08-04 00:59:34 +00:00
Joe Fernandez
9d606e0082 docs: Add TOC template logic for ARC docs
am: accb6660a5

Change-Id: I58282b1958be93e2247f873a9e8b13d0e192b56a
2016-08-04 00:51:04 +00:00
Joe Fernandez
accb6660a5 docs: Add TOC template logic for ARC docs
b/30114799

Change-Id: If36c3f9d46bf916b56b2884446451d423565606c
(cherry picked from commit 99aacfe834)
2016-08-03 23:18:00 +00:00
Adam Seaton
238cb7db91 Merge "Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH" into nyc-mr1-dev 2016-08-02 18:34:52 +00:00
Joe Fernandez
12636da2e0 docs: Add TOC template logic for ARC docs
am: 99aacfe834

Change-Id: I2831d967cbb2c1c5733ef3b6f235dbe96e75c565
2016-08-02 00:39:13 +00:00
Joe Fernandez
99aacfe834 docs: Add TOC template logic for ARC docs
b/30114799

Change-Id: If36c3f9d46bf916b56b2884446451d423565606c
2016-08-01 17:15:14 -07:00
Adam Seaton
8d4fac76b5 Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH
Change-Id: Id4eeaedac02900df7e635f378b54c2e58e9b5c6e
2016-07-29 11:52:35 -07:00
Dan Willemsen
f23e6bfda0 Limit find-copy-subdir-files to just files
This is used to add entries to PRODUCT_COPY_FILES -- those should always
be files, not directories or anything else special.

Bug: 30482029
Change-Id: I2691ae81c344c22e518c6b10cd485c73d654a03b
2016-07-28 23:16:45 +00:00
Adam Seaton
65f15a2755 Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2 am: 3c8083425d
am: e53fba3ebb

Change-Id: I15c4d862120b7e99a711b3f6485899b9eff1abbb
2016-07-28 22:59:39 +00:00
Adam Seaton
e53fba3ebb Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14 am: 989e951aa2
am: 3c8083425d

Change-Id: I2b903312ec651432d2753a4e8227c0fbe5823e58
2016-07-28 22:54:39 +00:00
Adam Seaton
3c8083425d Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55 am: 48b6f7db14
am: 989e951aa2

Change-Id: Ifa303a802377ab801633562200aac66899977b00
2016-07-28 22:51:42 +00:00
Adam Seaton
989e951aa2 Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours am: 41a8f2bd55
am: 48b6f7db14

Change-Id: I67d04d6ea6885be10aaf98d9edccbd2774e1c109
2016-07-28 22:49:13 +00:00
Adam Seaton
48b6f7db14 Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197 am: ed2fbe64ff -s ours
am: 41a8f2bd55

Change-Id: I2262c1a520c31d3c6ef94866c0e30f5ad9cb4ed2
2016-07-28 22:47:09 +00:00
Adam Seaton
41a8f2bd55 Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d am: 8118421197
am: ed2fbe64ff  -s ours

Change-Id: I898a77183877016cc9411a5d124548c4d60d2b26
2016-07-28 22:44:37 +00:00
Adam Seaton
ed2fbe64ff Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c am: d6eb8a739d
am: 8118421197

Change-Id: I6193353b95e616370adbfa2618d568073f167790
2016-07-28 22:36:12 +00:00
Adam Seaton
bddec86ed9 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9
am: f25aadc812

Change-Id: I7172d0aef5029648ad1d7792eaa9e291ab41ec97
2016-07-28 22:34:12 +00:00
Adam Seaton
8118421197 Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c am: a96455528c
am: d6eb8a739d

Change-Id: Ia2aeb08f9cb030048320beb6f5e0d625ff8b0b42
2016-07-28 22:34:11 +00:00
Adam Seaton
d6eb8a739d Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b am: a08cbbb97c
am: a96455528c

Change-Id: I019d3216bafbbba0158ddd9ff93f0d8edbd7c40c
2016-07-28 22:31:12 +00:00
Adam Seaton
f25aadc812 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7
am: 8736caaba9

Change-Id: Id5b440e150d514e85ee28aab7830d1d94e8cc5b9
2016-07-28 22:31:08 +00:00
Adam Seaton
8736caaba9 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23
am: 04fe21c7b7

Change-Id: Ia227b340514a58857cbf8f1f5ca35bbad9930e2b
2016-07-28 22:28:42 +00:00
Adam Seaton
a96455528c Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a am: 48e360c73b
am: a08cbbb97c

Change-Id: Ic0c7a50458cf9967baace9f3a46a5f61013b663d
2016-07-28 22:28:42 +00:00
Adam Seaton
a08cbbb97c Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278 am: a234c54e2a
am: 48e360c73b

Change-Id: Id53bea6c0a355d54c461b987e5a992c9211e6d32
2016-07-28 22:25:45 +00:00
Adam Seaton
04fe21c7b7 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541
am: 63ec9d8f23

Change-Id: I7d52cf2afe884476c22aaa429abc16e277620f10
2016-07-28 22:25:41 +00:00
Adam Seaton
63ec9d8f23 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev
am: 525c6aa541

Change-Id: I53403552530c0c449e3cd7f1afa59a9853712e88
2016-07-28 22:23:40 +00:00
Adam Seaton
48e360c73b Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/30224278
am: a234c54e2a

Change-Id: Icef9c0d868b8658faf79aabc99a811e0b715c362
2016-07-28 22:23:06 +00:00
Adam Seaton
525c6aa541 Updating security string to 2016-09-05 to platform and CTS in preparation
for 2016 September OTA on mnc-dev

b/30224278

Change-Id: I0f0591b7f0f033320de422c4019e056231228539
2016-07-28 21:21:06 +00:00
Adam Seaton
a234c54e2a Updating security string to 2016-09-05 in preparation for 2016 September
OTA for b/30224278

Change-Id: I055d0cc3a1a5f640dabf7a404c70c317e57959ca
2016-07-28 14:09:57 -07:00
Tao Bao
1a75fa6493 Handle multiple APKs from the same package in check_target_files_signatures.py.
We were using the package name as the key to index APKs. APKs from the
same package got messed up and gave wrong signature summary. Switch to
using the package filename as the key, which is identical in a given build.

Also fix the trailing space when printing the signature summary.

Bug: 30418268
Test: Run with a target_files.zip that has multiple APKs from the same package.

Change-Id: I6317e8c05e987c5690915e05c294153d10e2f0ab
(cherry picked from commit 6a54299fbd)
2016-07-27 21:30:16 -07:00
Zach Jang
a212b9c250 Merge \\\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\\" into mnc-dev am: cb4ba4c90c am: 942c341ab1 am: 37688e09fb am: bf8d3a2105
am: 37c17db1c6

Change-Id: Ia894b80e649552407714a685c2c33082204fb474
2016-07-21 15:27:58 +00:00
Zach Jang
ea8bae7ef7 Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d am: 5e9c40c879 am: d46066851f am: c8b3df9fb8 am: 46a86bf9d5 am: 984987506a am: 2c64061e72 -s ours am: f1be3289ff am: f1ee7d660f am: d3d24134a6 am: f94bec3382
am: d1dae843e3

Change-Id: I072ee0a99b35aab5b6f7c30335da6f4c211b331a
2016-07-21 15:27:57 +00:00
Claes Elgemark
3bc451f114 DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053 am: 160e0054dd am: 96e784eb4a -s ours
am: f8f74bafd2

Change-Id: I8777c82581d0ba08117c4bc50a6b78b626a81524
2016-07-21 15:27:56 +00:00
Zach Jang
37c17db1c6 Merge \\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\" into mnc-dev am: cb4ba4c90c am: 942c341ab1 am: 37688e09fb
am: bf8d3a2105

Change-Id: I92f956bcbd342f0fa953fed5ffb6d1462bbe3c4c
2016-07-21 15:21:00 +00:00
Zach Jang
d1dae843e3 Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d am: 5e9c40c879 am: d46066851f am: c8b3df9fb8 am: 46a86bf9d5 am: 984987506a am: 2c64061e72 -s ours am: f1be3289ff am: f1ee7d660f am: d3d24134a6
am: f94bec3382

Change-Id: I1509caa4109a7ea93f179e7d640e554f0cd96b74
2016-07-21 15:20:59 +00:00
Claes Elgemark
f8f74bafd2 DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053 am: 160e0054dd
am: 96e784eb4a  -s ours

Change-Id: I95310c02d97efd4331e0cb0f759ec26b8b403edb
2016-07-21 15:20:59 +00:00
Zach Jang
bf8d3a2105 Merge \\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\" into mnc-dev am: cb4ba4c90c am: 942c341ab1
am: 37688e09fb

Change-Id: I9c13a7d9f2ab8d96faaea5501131dd3b248fcf91
2016-07-20 18:20:19 +00:00
Zach Jang
37688e09fb Merge \\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\" into mnc-dev am: cb4ba4c90c
am: 942c341ab1

Change-Id: I29c8fae334dbd8f7d8a94dfa9dcf69c77aa18103
2016-07-20 18:17:18 +00:00
Zach Jang
f94bec3382 Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d am: 5e9c40c879 am: d46066851f am: c8b3df9fb8 am: 46a86bf9d5 am: 984987506a am: 2c64061e72 -s ours am: f1be3289ff am: f1ee7d660f
am: d3d24134a6

Change-Id: Ia90d6d102d9036529742f9491bd1c6ae56d3f8f8
2016-07-20 18:17:18 +00:00
Zach Jang
942c341ab1 Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
am: cb4ba4c90c

Change-Id: I7d4110e803b2775a4009c5adf1d249f98a2d0fa3
2016-07-20 18:14:48 +00:00
Zach Jang
d3d24134a6 Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d am: 5e9c40c879 am: d46066851f am: c8b3df9fb8 am: 46a86bf9d5 am: 984987506a am: 2c64061e72 -s ours am: f1be3289ff
am: f1ee7d660f

Change-Id: I18f7a195e607860043eeb0bc5ef4ee28ec8325a1
2016-07-20 18:14:48 +00:00
Zach Jang
f1ee7d660f Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d am: 5e9c40c879 am: d46066851f am: c8b3df9fb8 am: 46a86bf9d5 am: 984987506a am: 2c64061e72 -s ours
am: f1be3289ff

Change-Id: I6f093b1be27f18d1d3aea0c44c031cf6c0d67d2d
2016-07-20 18:11:18 +00:00