Commit graph

29515 commits

Author SHA1 Message Date
Tao Bao
00f2147e70 Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef am: e7847765a6
am: a7dcbfb2d8

Change-Id: I1958c8e75f83812ed493221fdf2fb74ee406becb
2017-03-16 18:30:53 +00:00
Tao Bao
a7dcbfb2d8 Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef
am: e7847765a6

Change-Id: Icb06ee24b3c29ff095b127a4148b945e886859ac
2017-03-16 18:25:54 +00:00
Tao Bao
e7847765a6 Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev
am: 5a4508bcef

Change-Id: If09ef383865b95b7dd65522d7c369b98144c5520
2017-03-16 18:22:54 +00:00
Tao Bao
5a4508bcef Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev 2017-03-16 18:19:39 +00:00
Adam Seaton
7e925268af DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3 -s ours am: 8d6607c91e am: b9a68b56fc
am: acb61d098f

Change-Id: Ia8bfc0585e1226e8de8c24931cd7a7fa79e9476d
2017-03-16 17:07:26 +00:00
Adam Seaton
676aefaa81 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours am: e1d7ca1ec7 am: 35c6a6d4a3 am: 099df1bb0d am: c1d127aa41 -s ours am: 635c2bd638 am: 0dd56e764d
am: ef22893c43

Change-Id: Ia906c8f40868f9434e69861ff02c76fcaaa8d9be
2017-03-16 17:07:17 +00:00
Adam Seaton
acb61d098f DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3 -s ours am: 8d6607c91e
am: b9a68b56fc

Change-Id: I6ec4c7bfd6a3e89bdfdf2f335ce42ec874abf4c1
2017-03-16 17:03:56 +00:00
Adam Seaton
ef22893c43 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours am: e1d7ca1ec7 am: 35c6a6d4a3 am: 099df1bb0d am: c1d127aa41 -s ours am: 635c2bd638
am: 0dd56e764d

Change-Id: Ia9ee069fbacf8c6dabe4094bbbc4994facaae36d
2017-03-16 17:03:47 +00:00
Adam Seaton
b9a68b56fc DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3 -s ours
am: 8d6607c91e

Change-Id: Ib95b40ac17c6fc7260b96248760699c314f570ab
2017-03-16 17:01:25 +00:00
Adam Seaton
0dd56e764d DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours am: e1d7ca1ec7 am: 35c6a6d4a3 am: 099df1bb0d am: c1d127aa41 -s ours
am: 635c2bd638

Change-Id: I5a78c751c9fbad786f4a657c85b225a16bb74a55
2017-03-16 17:01:17 +00:00
Adam Seaton
cc1c6b5013 DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe am: 88ba3a3bf8 -s ours am: fc869b58e8 am: 959da97bba am: 7f4fbb79ac am: 9754351b7c -s ours am: f727c7433b am: 9525d910c7
am: 00bec5014e

Change-Id: I91bc39d6260b91659b47ab3643ab60b75b3fd2a0
2017-03-16 16:58:24 +00:00
Adam Seaton
8d6607c91e DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f
am: b6279913b3  -s ours

Change-Id: Iee68c8539156a9a1212269b7559bf2bbc2dbf679
2017-03-16 16:58:21 +00:00
Adam Seaton
df19005be4 DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours am: 637f66925f am: 3481be638f -s ours am: d4f9e95f7c am: 6962385144 am: 128b958afb am: 43cbfe0486 -s ours am: 0086be3401 am: 6af2006770
am: ea8a508c66

Change-Id: I91f942ab39c564a58d629bedd57967a86a6b0327
2017-03-16 16:58:16 +00:00
Adam Seaton
635c2bd638 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours am: e1d7ca1ec7 am: 35c6a6d4a3 am: 099df1bb0d
am: c1d127aa41  -s ours

Change-Id: Ie815da36673001b4583d0efff84b15adde39f542
2017-03-16 16:58:15 +00:00
Adam Seaton
00bec5014e DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe am: 88ba3a3bf8 -s ours am: fc869b58e8 am: 959da97bba am: 7f4fbb79ac am: 9754351b7c -s ours am: f727c7433b
am: 9525d910c7

Change-Id: I6ec6d1a4ec1a5767cce371d3dbbc7828ae4b3a8f
2017-03-16 16:55:24 +00:00
Adam Seaton
b6279913b3 DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf am: 3ded290e7d
am: 2996209f6f

Change-Id: I21b30e7b6d572d4a1e86cb9ae68b33bafc8a19cb
2017-03-16 16:55:22 +00:00
Adam Seaton
ea8a508c66 DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours am: 637f66925f am: 3481be638f -s ours am: d4f9e95f7c am: 6962385144 am: 128b958afb am: 43cbfe0486 -s ours am: 0086be3401
am: 6af2006770

Change-Id: I5969aad359be16b597bf2896ded771de00d48655
2017-03-16 16:55:16 +00:00
Adam Seaton
c1d127aa41 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours am: e1d7ca1ec7 am: 35c6a6d4a3
am: 099df1bb0d

Change-Id: I459ef0225cc32954e417fabc8006a65ae64f90ca
2017-03-16 16:55:16 +00:00
Adam Seaton
9525d910c7 DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe am: 88ba3a3bf8 -s ours am: fc869b58e8 am: 959da97bba am: 7f4fbb79ac am: 9754351b7c -s ours
am: f727c7433b

Change-Id: I9648c08b1b5c44e22e02d8d25b7a5a66f83797d7
2017-03-16 16:53:25 +00:00
Adam Seaton
6137f438b9 DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432 am: 84869ab1e2 am: 7723fd8988 -s ours am: 26c199ecc2 am: 702c3b28f7
am: bbc95c4952

Change-Id: I7041923f66c736759c8f49c2e585698a791e8813
2017-03-16 16:53:25 +00:00
Adam Seaton
6af2006770 DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours am: 637f66925f am: 3481be638f -s ours am: d4f9e95f7c am: 6962385144 am: 128b958afb am: 43cbfe0486 -s ours
am: 0086be3401

Change-Id: I304639c97dbb577ea3e140db18b79cd3ab0a9840
2017-03-16 16:53:15 +00:00
Adam Seaton
3365b2ddcf DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37 am: bb768aa837 am: 92380f630e -s ours am: b62cd71b07 am: 5bb7f611ac
am: af68a49351

Change-Id: I7c248ab0147d970cae86fe9adbfb589fded610ea
2017-03-16 16:53:15 +00:00
Adam Seaton
2996209f6f DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours am: b65c93dbcf
am: 3ded290e7d

Change-Id: I1646614f2fcb0990c03f168aaa9b0768f1f5eae2
2017-03-16 16:52:54 +00:00
Adam Seaton
099df1bb0d DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours am: e1d7ca1ec7
am: 35c6a6d4a3

Change-Id: Idcb0514e5e5dca5f09c222632ee23112d20560dc
2017-03-16 16:52:46 +00:00
Adam Seaton
bbc95c4952 DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432 am: 84869ab1e2 am: 7723fd8988 -s ours am: 26c199ecc2
am: 702c3b28f7

Change-Id: I46798e396f423639949c0d90d487c1fe01cf3d22
2017-03-16 16:50:20 +00:00
Adam Seaton
3ded290e7d DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff am: bff6f7d991 -s ours
am: b65c93dbcf

Change-Id: I64613daf3496d52137f8bb51b0624d05590a308b
2017-03-16 16:50:20 +00:00
Adam Seaton
f727c7433b DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe am: 88ba3a3bf8 -s ours am: fc869b58e8 am: 959da97bba am: 7f4fbb79ac
am: 9754351b7c  -s ours

Change-Id: I19ffcce5be291de5b4afcb49c233829101c34038
2017-03-16 16:50:17 +00:00
Adam Seaton
af68a49351 DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37 am: bb768aa837 am: 92380f630e -s ours am: b62cd71b07
am: 5bb7f611ac

Change-Id: I57bb4f33f18027ca4da8debfa273a62459597391
2017-03-16 16:50:14 +00:00
Adam Seaton
35c6a6d4a3 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30 am: 5af5f2c46f -s ours
am: e1d7ca1ec7

Change-Id: Idf8c58e418176e8a24f7d06cde5c359d093671a5
2017-03-16 16:50:14 +00:00
Adam Seaton
0086be3401 DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours am: 637f66925f am: 3481be638f -s ours am: d4f9e95f7c am: 6962385144 am: 128b958afb
am: 43cbfe0486  -s ours

Change-Id: Iee5da90d3503c3822d433d76d86e6aba50b37b8d
2017-03-16 16:50:13 +00:00
Adam Seaton
702c3b28f7 DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432 am: 84869ab1e2 am: 7723fd8988 -s ours
am: 26c199ecc2

Change-Id: I10a5a2b61f9b39e800f69f71209ce4a0b528e452
2017-03-16 16:47:51 +00:00
Adam Seaton
9754351b7c DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe am: 88ba3a3bf8 -s ours am: fc869b58e8 am: 959da97bba
am: 7f4fbb79ac

Change-Id: I74f2e2433f64b5d6ea5e26ea80b1f7280439babc
2017-03-16 16:47:50 +00:00
Adam Seaton
b65c93dbcf DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours am: b3b5777fff
am: bff6f7d991  -s ours

Change-Id: Ic9c4aff7a22aee77a341164e3c49b5c521a370cd
2017-03-16 16:47:49 +00:00
Adam Seaton
5bb7f611ac DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37 am: bb768aa837 am: 92380f630e -s ours
am: b62cd71b07

Change-Id: I7e32f977bd071487af2b7b384ce16bc94bf216aa
2017-03-16 16:47:44 +00:00
Adam Seaton
e1d7ca1ec7 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours am: 8edd5d7e30
am: 5af5f2c46f  -s ours

Change-Id: Ia45004d7e5396f1add6121c4040e85efe0faa319
2017-03-16 16:47:44 +00:00
Adam Seaton
43cbfe0486 DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours am: 637f66925f am: 3481be638f -s ours am: d4f9e95f7c am: 6962385144
am: 128b958afb

Change-Id: I4ff8bdff23c0e3b5ac5637f8c2a90737b35a109d
2017-03-16 16:47:44 +00:00
Tao Bao
99c17252ac releasetools: Support generating downgrade A/B OTAs.
We already support generating downgrade OTAs for non-A/B devices (with
mandatory data wipe), but we have missed the --downgrade flag in A/B OTA
path.

This CL factors out the function that writes the downgrade metadata, and
fixes the path for generating A/B OTAs.

Bug: 35094540
Bug: 36183651
Test: Generate incrementals with --downgrade for A/B and non-A/B OTAs.
Change-Id: I30b9bf83e69e8aba3be666507681b555db6ab743
Merged-In: I30b9bf83e69e8aba3be666507681b555db6ab743
(cherry picked from commit b31892e5de)
2017-03-16 16:47:10 +00:00
Adam Seaton
b7baf15d67 Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd
am: f773f981bb

Change-Id: I48d86f33ce511eee148a43eb0c9f60da53953d15
2017-03-16 16:44:57 +00:00
Adam Seaton
7f4fbb79ac DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe am: 88ba3a3bf8 -s ours am: fc869b58e8
am: 959da97bba

Change-Id: Ia9eba2faa155043c5e0da2122c1a204f7e5d19b3
2017-03-16 16:44:50 +00:00
Adam Seaton
bff6f7d991 DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours
am: b3b5777fff

Change-Id: Ie1e065ba9a5ec8342794bee335ee7e1e63e415fa
2017-03-16 16:44:49 +00:00
Adam Seaton
26c199ecc2 DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432 am: 84869ab1e2
am: 7723fd8988  -s ours

Change-Id: I3caa1ea57196219d92a353adff18b00cccb9d273
2017-03-16 16:44:48 +00:00
Adam Seaton
5af5f2c46f DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours
am: 8edd5d7e30

Change-Id: I1af375875167b1f62073c20eb3ef3ce4c95d9f89
2017-03-16 16:44:44 +00:00
Adam Seaton
128b958afb DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours am: 637f66925f am: 3481be638f -s ours am: d4f9e95f7c
am: 6962385144

Change-Id: I94de1376e0d7a0d4d6e32c9562e7328b3dd106d5
2017-03-16 16:44:44 +00:00
Adam Seaton
e815842343 Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42
am: 751d4cd04e

Change-Id: I5f2098c7aeac332db181a7327a84400de7344c47
2017-03-16 16:44:44 +00:00
Adam Seaton
b62cd71b07 DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37 am: bb768aa837
am: 92380f630e  -s ours

Change-Id: I8a51b543b0269b92ca87f80bdc5a91db3dacb84e
2017-03-16 16:44:43 +00:00
Adam Seaton
f773f981bb Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7
am: d5894faefd

Change-Id: Ibe7c5aa0d259e9cf2e7cbb9c4a5b5419e3eed283
2017-03-16 16:42:00 +00:00
Adam Seaton
959da97bba DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe am: 88ba3a3bf8 -s ours
am: fc869b58e8

Change-Id: Ibd6463edf17bebc31ff43676d9a8b22314524577
2017-03-16 16:41:49 +00:00
Adam Seaton
7723fd8988 DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432
am: 84869ab1e2

Change-Id: I9c5be058a27139b73fb331248c682f17a9bfbfe1
2017-03-16 16:41:49 +00:00
Adam Seaton
b3b5777fff DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours
am: 1b9f1e8156  -s ours

Change-Id: I05a6a8899f3c974934ab8929642fc17f4131dacc
2017-03-16 16:41:47 +00:00
Adam Seaton
8edd5d7e30 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours
am: 5e0c5f0263  -s ours

Change-Id: I9a9c1d88f083e3284c0f5aa29c60b436a02991d7
2017-03-16 16:41:44 +00:00