Commit Graph

28975 Commits

Author SHA1 Message Date
Adam Seaton 773e5235e6 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01
am: 53980e19aa  -s ours

Change-Id: If3de5b44ae34ef52a397f4480c556828354a4f9a
2017-04-13 22:43:09 +00:00
Adam Seaton a0e65c2249 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb
am: d8dbdc0809  -s ours

Change-Id: Id409cd89c262cb8b64b1141dfa6576f59786271c
2017-04-13 22:42:57 +00:00
Adam Seaton 53980e19aa [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9
am: 6e52769b01

Change-Id: Ie0a5aeb63c41a94b5bca5328a12e900feaa2f9b0
2017-04-12 23:29:47 +00:00
Adam Seaton 6e52769b01 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef
am: 5e089f6be9

Change-Id: I1b974dcf745c93238d1d5ae0c8e43e1d080f56c3
2017-04-12 23:24:17 +00:00
Adam Seaton 5e089f6be9 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours
am: b57f591fef

Change-Id: I1f240898b3911b48e3a1145e60ff317b8ef55475
2017-04-12 23:18:46 +00:00
Adam Seaton d8dbdc0809 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86
am: cf896d4bcb

Change-Id: Ib58f03f7346aa706508d9dc082c9661865478485
2017-04-12 23:13:16 +00:00
Adam Seaton b57f591fef [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7
am: 13b453c917  -s ours

Change-Id: I0661e9917468d2d7dc21e48ef8ae511cff4dcba4
2017-04-12 23:13:16 +00:00
Adam Seaton cf896d4bcb Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926
am: 2596931e86

Change-Id: I3084760ec275de17fa024379decf98303799e213
2017-04-12 23:07:46 +00:00
Adam Seaton 13b453c917 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours
am: ff3f6e29e7

Change-Id: I353b3f3ed97e65d0db5f42409cb5229e42119e31
2017-04-12 23:07:45 +00:00
Adam Seaton 2596931e86 Merge changes I5c252cba,I80259eef into mnc-dev
am: ea6878b926

Change-Id: I1fa56eef94ac1a5108303bc93b3a32ac48ec9e94
2017-04-12 23:03:15 +00:00
Adam Seaton ff3f6e29e7 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
am: 91a21e9d12  -s ours

Change-Id: Ia3faf06a43a8c39b5a021791d2a84460539a5eb3
2017-04-12 23:02:44 +00:00
Adam Seaton ea6878b926 Merge changes I5c252cba,I80259eef into mnc-dev
* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
  [DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev
2017-04-12 22:49:42 +00:00
Adam Seaton 47d4a317fa [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0
am: c4d46c791a  -s ours

Change-Id: I7dbb4801b9d823e463a48734ba1c5d5ba0616bb4
2017-04-12 22:42:20 +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 c4d46c791a [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303
am: d1174126d0

Change-Id: I5cb4bb59b127239ef2c25d1dc1901b6f04a5c837
2017-04-12 22:36:51 +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 d1174126d0 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e
am: 47e5cb0303

Change-Id: Iff9d5d2ad014e7541b4369254671ca997d67fb61
2017-04-12 22:31:19 +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 47e5cb0303 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours
am: 9a805d9e3e

Change-Id: I745302c0eb88b25169a03016bbf31962548723ef
2017-04-12 22:26:47 +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 9a805d9e3e [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722
am: fa8973ba33  -s ours

Change-Id: Ib0e73771aa5d25dd0fac1e673f3fb10731476974
2017-04-12 22:21:17 +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 fa8973ba33 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours
am: 2d19cbf722

Change-Id: Ifebd5e3fd4f621ffaaa1b477fd0c90a72e855aad
2017-04-12 22:16:46 +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 2d19cbf722 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours
am: 2d14a7da35  -s ours

Change-Id: I98bf2f1ac4b53269f460846a522d7e13343df169
2017-04-12 22:11:46 +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 2d14a7da35 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404
am: 89ebb51f6b  -s ours

Change-Id: Iaf0beaf284058235ce55de23a99e5adae2a4eefd
2017-04-12 22:05:45 +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 89ebb51f6b [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3
am: 35e82a6404

Change-Id: Idc0ff4956a850aab3130249eb8dacfc7451ce990
2017-04-12 22:00:12 +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 35e82a6404 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
am: c686e139b3

Change-Id: I4a0954f6f3f75841d7eb54c6c7073ae6642d1c2a
2017-04-12 21:55:12 +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 80f445482c [DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
bug:37204197
Change-Id: I5c252cba4fc0ad0d605218a71da91843256c4c64
2017-04-12 21:24:54 +00:00
Adam Seaton 91a21e9d12 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
bug:37204197
Change-Id: Iee17fa80c5c29b439bcbe85f11526a8b89247fdf
2017-04-12 21:22:54 +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 060a4a1c76 [DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev
bug:37204197
Change-Id: I80259eef1e7a0d0761d3bb31082b7b3606cef669
2017-04-11 18:18:48 +00:00
Adam Seaton 380441000d [DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev
bug:37204197
Change-Id: Id9ee50bec46f2fd3f9e2e5f546c062f946bff36f
2017-04-11 18:17:34 +00:00
Adam Seaton c686e139b3 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
Bug:37204197
Change-Id: I797a8c6332a3bf62ba6ba9b17de9754e7cf5a902
2017-04-10 09:38:38 -07: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 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 5a4508bcef Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev 2017-03-16 18:19:39 +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 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 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 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 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 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