Adam Seaton
b81762de8d
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
am: 14ef6098bb
am: a34845a20c
am: a73f9cf1f5
-s ours am: 3720a2f373
am: 597a5a8b14
am: 859eeaa4ad
-s ours am: 9a0ddb1332
-s ours
...
am: f96d8a15d8
-s ours
Change-Id: Ic3b5dbfc0ce16f08e4684bf04682cf2e8e81bc34
2017-04-12 23:08:11 +00:00
Adam Seaton
f3d9b0323d
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f
am: 15420e5bb0
am: 49ca7ee1b0
-s ours am: 557f15a715
-s ours
...
am: 6e77a62f7e
-s ours
Change-Id: Ic3a4285e773e4c9a8265d112a6dfae9d49575d39
2017-04-12 23:07:50 +00:00
Adam Seaton
63750aafe0
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599
am: 518f3b9283
am: c347cb4986
-s ours am: 5958603884
-s ours
...
am: 752ed1efb9
-s ours
Change-Id: I9659eca415360ac9f522ae971b8f1718b7141128
2017-04-12 23:07:45 +00:00
Adam Seaton
f96d8a15d8
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
am: 14ef6098bb
am: a34845a20c
am: a73f9cf1f5
-s ours am: 3720a2f373
am: 597a5a8b14
am: 859eeaa4ad
-s ours
...
am: 9a0ddb1332
-s ours
Change-Id: I8dfd15cb89870feedfccb5cc82d2f01eb42d27f2
2017-04-12 23:03:37 +00:00
Adam Seaton
6e77a62f7e
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f
am: 15420e5bb0
am: 49ca7ee1b0
-s ours
...
am: 557f15a715
-s ours
Change-Id: I41ea577729e4f96902024424d3df26c50e7181b9
2017-04-12 23:03:19 +00:00
Adam Seaton
752ed1efb9
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599
am: 518f3b9283
am: c347cb4986
-s ours
...
am: 5958603884
-s ours
Change-Id: I273d0b9c4f49357d2cf5171311f28fb2ddb189ef
2017-04-12 23:03:14 +00:00
Adam Seaton
9a0ddb1332
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
am: 14ef6098bb
am: a34845a20c
am: a73f9cf1f5
-s ours am: 3720a2f373
am: 597a5a8b14
...
am: 859eeaa4ad
-s ours
Change-Id: Ifa42571c6012ddfd2d49a78f2d9cb70e066366ed
2017-04-12 22:58:08 +00:00
Adam Seaton
557f15a715
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f
am: 15420e5bb0
...
am: 49ca7ee1b0
-s ours
Change-Id: I20dfe51c2f6f5bc9b28483c280743c2a16803874
2017-04-12 22:57:50 +00:00
Adam Seaton
5958603884
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599
am: 518f3b9283
...
am: c347cb4986
-s ours
Change-Id: Ia79bf2c1c809475bc3553940b0d8d5ac435f52fe
2017-04-12 22:57:44 +00:00
Adam Seaton
859eeaa4ad
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
am: 14ef6098bb
am: a34845a20c
am: a73f9cf1f5
-s ours am: 3720a2f373
...
am: 597a5a8b14
Change-Id: Ic0f2ee49ee4d02e8ce7196329cc785d4eb9bcb2f
2017-04-12 22:52:36 +00:00
Adam Seaton
49ca7ee1b0
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f
...
am: 15420e5bb0
Change-Id: Ia48ded0030f51f9f5381e1b84cb1d5a28d7bae42
2017-04-12 22:52:19 +00:00
Adam Seaton
c347cb4986
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599
...
am: 518f3b9283
Change-Id: Idcf446c209e4ef340d48942d63c5cabcc5d5bec6
2017-04-12 22:52:14 +00:00
Adam Seaton
597a5a8b14
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
am: 14ef6098bb
am: a34845a20c
am: a73f9cf1f5
-s ours
...
am: 3720a2f373
Change-Id: Ie90347f52af1c4fad0978d34aa2d9fde8abaf3ab
2017-04-12 22:47:40 +00:00
Adam Seaton
15420e5bb0
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
...
am: 70d708e29f
Change-Id: Iee4027fe4abe311f44582b430786ff3011d93476
2017-04-12 22:47:17 +00:00
Adam Seaton
518f3b9283
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
...
am: d9a5e99599
Change-Id: I732c1fdf51b33a7588bdec0f5d86bb6a6210b334
2017-04-12 22:47:13 +00:00
Adam Seaton
3720a2f373
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
am: 14ef6098bb
am: a34845a20c
...
am: a73f9cf1f5
-s ours
Change-Id: I2863a1477faf4c78b9e8f76dde98d2a1bba876c3
2017-04-12 22:42:15 +00:00
Adam Seaton
a73f9cf1f5
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
am: 14ef6098bb
...
am: a34845a20c
Change-Id: I597322f70ca78e3632a59b6c0722b0fe3130a015
2017-04-12 22:36:43 +00:00
Adam Seaton
a34845a20c
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours am: 988fc368d3
...
am: 14ef6098bb
Change-Id: If78940c3c89e6bac35eb051bfa7908e03d18ee1a
2017-04-12 22:31:13 +00:00
Adam Seaton
14ef6098bb
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
am: 18c3da68f0
-s ours
...
am: 988fc368d3
Change-Id: Ice678f7c46970fe343208e5b793bbd362439192e
2017-04-12 22:26:42 +00:00
Adam Seaton
988fc368d3
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours am: 65101a958e
...
am: 18c3da68f0
-s ours
Change-Id: I5d27b65e5817456cab95468c7531f3621e95cb7d
2017-04-12 22:21:12 +00:00
Adam Seaton
18c3da68f0
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours am: 4389a11f4b
-s ours
...
am: 65101a958e
Change-Id: I523c87b067d7693b121242a73be982b4094e62bf
2017-04-12 22:16:42 +00:00
Adam Seaton
65101a958e
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
am: 386d7ae2e8
-s ours
...
am: 4389a11f4b
-s ours
Change-Id: I7470bfd4621f2281ee2bf03c8dd0fb0e80bba5e6
2017-04-12 22:11:42 +00:00
Adam Seaton
4389a11f4b
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07
...
am: 386d7ae2e8
-s ours
Change-Id: I272f3827ce226d1bde50e7391e288436277297c2
2017-04-12 22:05:41 +00:00
Adam Seaton
386d7ae2e8
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
...
am: 8dcfa2ac07
Change-Id: I3e236b94d24700299389ae02501ef8a232dad598
2017-04-12 22:00:09 +00:00
Adam Seaton
8dcfa2ac07
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
...
am: e6a77de43b
Change-Id: I695b346d4769e30995ea91f0e864fd95afe4866a
2017-04-12 21:55:10 +00:00
Adam Seaton
70d708e29f
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
...
bug:37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16
2017-04-12 21:26:52 +00:00
Adam Seaton
d9a5e99599
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
...
bug:37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9
2017-04-11 18:20:36 +00:00
Adam Seaton
e6a77de43b
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
...
Bug:37204197
Change-Id: I7b0b5428c9b1f7ea7ab3a3e272689e6324dde8af
2017-04-10 09:36:42 -07:00
Tao Bao
c0413986fb
releasetools: Add support for --override_timestamp. am: 9f884e6c55
am: 9ee7071553
am: d5de271e01
am: bd7cdf43e3
...
am: 912683668f
Change-Id: I8d7a991f39c193ef00d76cb0d1d8481a73232df0
2017-03-16 23:31:45 +00:00
Tao Bao
912683668f
releasetools: Add support for --override_timestamp. am: 9f884e6c55
am: 9ee7071553
am: d5de271e01
...
am: bd7cdf43e3
Change-Id: I31733663defae8c86c7186a670e0188d615baf70
2017-03-16 23:28:44 +00:00
Tao Bao
bd7cdf43e3
releasetools: Add support for --override_timestamp. am: 9f884e6c55
am: 9ee7071553
...
am: d5de271e01
Change-Id: I44393a7da71f4d2d4800054d73526277f4e623f1
2017-03-16 23:26:45 +00:00
Tao Bao
d5de271e01
releasetools: Add support for --override_timestamp. am: 9f884e6c55
...
am: 9ee7071553
Change-Id: I58f6108d8d620d39d673e2be9489cb13b50fbbb0
2017-03-16 23:24:13 +00:00
Tao Bao
9ee7071553
releasetools: Add support for --override_timestamp.
...
am: 9f884e6c55
Change-Id: Ie17ff6bffa91d16bbb4a3de123fc8aa97a35d266
2017-03-16 23:21:13 +00:00
Tao Bao
58bb2216da
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef
am: e7847765a6
am: a7dcbfb2d8
am: 712bf7d750
...
am: 6ea73e3566
Change-Id: I79f8ed59d9011f84ccf71e1c30e7cdce6c2afd26
2017-03-16 18:38:23 +00:00
Tao Bao
6ea73e3566
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef
am: e7847765a6
am: a7dcbfb2d8
...
am: 712bf7d750
Change-Id: I1fa4bbb35db7fe15caec70d0671c32e607c9b976
2017-03-16 18:35:24 +00:00
Tao Bao
712bf7d750
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev am: 5a4508bcef
am: e7847765a6
...
am: a7dcbfb2d8
Change-Id: I050b7b31b923ddc27d3afea0bdeb76ee658859c9
2017-03-16 18:30:52 +00:00
Tao Bao
9f884e6c55
releasetools: Add support for --override_timestamp.
...
We use the timestamps in builds to determine a downgrade, which might
not be always the truth. For examples, two builds cut from different
branches may carry timestamps in a reverse order. An incremental package
won't be able to be pushed nor applied, based on the timestamp
comparison.
We used to handle such a case with manual work, by setting the
post-timestamp to (pre-timestamp + 1) in the package metadata. This CL
automates the process by adding a new flag --override_timestamp.
Note that it doesn't change anything in the installed image, but only
affects the assertions for pushing / installing the package.
With the change in this CL:
- If it's a downgrade without any extra flag, fail the package
generation (we only print warnings prior to this CL);
- If it's a downgrade with --downgrade flag, generate a downgrade
package with forced data wipe (same as before);
- If it's a downgrade with --override_timestamp, generate a normal
incremental with hacked timestamp (pre-timestamp + 1) (new in this CL
to avoid the manual change);
- If it's not a downgrade but with any of the above two flags specified,
fail the package generation.
Bug: 33744169
Test: Generate an incremental from builds with reversed timestamps.
Change-Id: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
Merged-In: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
(cherry picked from commit 3e6161a3b3
)
2017-03-16 11:26:06 -07: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
3c08a84090
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
-s ours am: 8873aa245d
-s ours
...
am: b1f03425ba
-s ours
Change-Id: I6675508ffd216c4e6ef112da2edc0063a3e784a7
2017-03-16 17:11:53 +00:00
Adam Seaton
1a431f8fe6
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
-s ours am: 003c280d29
-s ours
...
am: 16d3b7571a
-s ours
Change-Id: I3afbc5676a7d4275667c70b92c24793c34354645
2017-03-16 17:11:45 +00:00
Adam Seaton
b1f03425ba
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
-s ours
...
am: 8873aa245d
-s ours
Change-Id: I1a218b22073d31b370f2558367507e54273458db
2017-03-16 17:09:21 +00:00
Adam Seaton
16d3b7571a
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
-s ours
...
am: 003c280d29
-s ours
Change-Id: I7f4275de25d05197d50e05111f17e95a3bb741f2
2017-03-16 17:09:15 +00:00
Adam Seaton
8873aa245d
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
-s ours
Change-Id: Id4601f83e700c98579c6a1aed8acf2791a4c7757
2017-03-16 17:07:23 +00:00
Adam Seaton
003c280d29
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
-s ours
Change-Id: I7ec448e9f1a70b8dbc4e199fa143e1d769f06828
2017-03-16 17:07:16 +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
f8ac99f932
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
-s ours am: fb17367c34
-s ours
...
am: 6682fdbc78
-s ours
Change-Id: I36322b7f1012c3b7452ccccab32655e8a4012c60
2017-03-16 17:03:53 +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
dfa2a291d2
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
-s ours am: a981ae128e
-s ours
...
am: 5df927b12e
-s ours
Change-Id: I65772a09837c1a49b4139da50535f92c3419ee5b
2017-03-16 17:03:46 +00:00