Tao Bao
9c6ab6c49b
Fix the broken script in AssertFingerprintOrThumbprint.
...
Bug: 62252466
Test: Re-generate an incremental OTA that goes from the fingerprint to
thumbprint, and check the updater-script.
Change-Id: I6e2cbf68cbd22fbcf0d200fc3fdc8a33da510a53
(cherry picked from commit d2d01e519e
2017-06-05 13:20:42 -07:00
Tao Bao
fccf4ec06e
Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev
2017-06-02 22:42:27 +00:00
TreeHugger Robot
1590301a9b
Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev
2017-06-02 03:06:59 +00:00
Tao Bao
7fc951ca6a
DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
...
This CL fixes the bug in [1] (copy-paste error) and reenables it.
We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.
[1] commit c086370440
2017-06-01 14:59:46 -07:00
Adam Seaton
5ae680c1f6
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45
...
am: 9e9542d085
2017-05-23 20:35:31 +00:00
Adam Seaton
9e9542d085
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466
...
am: ffb37ffc45
2017-05-23 20:33:00 +00:00
Adam Seaton
ffb37ffc45
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours
...
am: 2f755b5466
2017-05-23 20:30:30 +00:00
Adam Seaton
2f755b5466
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec
...
am: 16af70a949
2017-05-23 20:27:58 +00:00
Adam Seaton
fe5a42c88d
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4
...
am: e01e278881
2017-05-23 17:40:44 +00:00
Adam Seaton
e01e278881
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9
...
am: c1b0be15c4
2017-05-23 17:38:43 +00:00
Adam Seaton
c1b0be15c4
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev
...
am: 95f77a84d9
2017-05-23 17:36:16 +00:00
Adam Seaton
16af70a949
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512
...
am: def58d6dec
2017-05-23 17:36:16 +00:00
Adam Seaton
def58d6dec
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360
...
am: f5c749c512
2017-05-23 17:34:13 +00:00
Adam Seaton
f5c749c512
Merge changes Id4d040ea,I318fb1fc into mnc-dev
...
am: a2603bd360
2017-05-23 17:32:15 +00:00
Adam Seaton
95f77a84d9
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev
...
* changes:
[DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev bug:38342695
[DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev bug:38342695
2017-05-23 17:29:00 +00:00
Adam Seaton
a2603bd360
Merge changes Id4d040ea,I318fb1fc into mnc-dev
...
* changes:
[DO NOT MERGE] Updating security string to 2017-07-05 on mnc-dev bug:38342695
[DO NOT MERGE] Updating security string to 2017-07-01 on mnc-dev bug:38342695
2017-05-23 17:28:28 +00:00
Adam Seaton
111b9d5599
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b
...
am: 9f80f090a8
2017-05-19 19:47:38 +00:00
Adam Seaton
9f80f090a8
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480
...
am: 04b0eb600b
2017-05-19 19:45:39 +00:00
Adam Seaton
04b0eb600b
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours
...
am: fc30cdc480
2017-05-19 19:44:08 +00:00
Adam Seaton
fc30cdc480
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a
...
am: 5482ef4491
2017-05-19 19:42:06 +00:00
Adam Seaton
5482ef4491
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3
...
am: 90028cf69a
2017-05-19 19:40:37 +00:00
Adam Seaton
90028cf69a
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91
...
am: 5868fb70b3
2017-05-19 19:38:36 +00:00
Adam Seaton
5868fb70b3
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours
...
am: 025c26de91
2017-05-19 19:36:37 +00:00
Adam Seaton
8b0ad111c3
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43
...
am: 974d64ee8f
2017-05-19 19:35:27 +00:00
Adam Seaton
0987d99c90
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9
...
am: 75864440c3
2017-05-19 19:35:07 +00:00
Adam Seaton
025c26de91
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6
...
am: b3219be744
2017-05-19 19:35:05 +00:00
Adam Seaton
974d64ee8f
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20
...
am: 70accb9b43
2017-05-19 19:33:25 +00:00
Adam Seaton
75864440c3
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69
...
am: 701dc24fb9
2017-05-19 19:33:06 +00:00
Adam Seaton
b3219be744
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours
...
am: 05965e37e6
2017-05-19 19:33:05 +00:00
Adam Seaton
70accb9b43
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours
...
am: 6a94730d20
2017-05-19 19:31:29 +00:00
Adam Seaton
701dc24fb9
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours
...
am: 288fd15d69
2017-05-19 19:31:06 +00:00
Adam Seaton
05965e37e6
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours
...
am: bf2d4968da
2017-05-19 19:31:04 +00:00
Adam Seaton
6a94730d20
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d
...
am: e10ce80409
2017-05-19 19:29:29 +00:00
Adam Seaton
288fd15d69
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8
...
am: 3f5593376d
2017-05-19 19:29:04 +00:00
Adam Seaton
bf2d4968da
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2
...
am: ad8ec7f781
2017-05-19 19:29:04 +00:00
Adam Seaton
e10ce80409
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231
...
am: 1899a63f1d
2017-05-19 19:27:37 +00:00
Adam Seaton
3f5593376d
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0
...
am: 535ade48f8
2017-05-19 19:27:05 +00:00
Adam Seaton
ad8ec7f781
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
...
am: 54f2af92b2
2017-05-19 19:27:04 +00:00
Adam Seaton
1899a63f1d
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd
...
am: 5c7bac6231
2017-05-19 19:26:00 +00:00
Adam Seaton
535ade48f8
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c
...
am: 16dcd532a0
2017-05-19 19:25:36 +00:00
Adam Seaton
54f2af92b2
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695
...
am: e2d22d501d
2017-05-19 19:25:35 +00:00
Adam Seaton
5c7bac6231
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours
...
am: 9f169ddbcd
2017-05-19 19:22:26 +00:00
Adam Seaton
16dcd532a0
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours
...
am: 7ad3c1407c
2017-05-19 19:22:05 +00:00
Adam Seaton
9f169ddbcd
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73
...
am: 8a893de625
2017-05-19 19:19:01 +00:00
Adam Seaton
eaf073cbee
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours am: ee22290a47 am: 7b94aecada
...
am: 7fe1da4f84
2017-05-19 19:18:35 +00:00
Adam Seaton
7ad3c1407c
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909
...
am: ddac9519eb
2017-05-19 19:18:33 +00:00
Adam Seaton
8a893de625
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours
...
am: 4cfcc9fe73
2017-05-19 19:16:54 +00:00
Adam Seaton
7fe1da4f84
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours am: ee22290a47
...
am: 7b94aecada
2017-05-19 19:16:36 +00:00
Adam Seaton
ddac9519eb
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours
...
am: 0a97d3f909
2017-05-19 19:16:34 +00:00
Adam Seaton
4cfcc9fe73
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
...
am: 11af5514df
2017-05-19 19:14:57 +00:00
