git.osdn.net Git - android-x86/build.git/log

Adam Seaton [Thu, 13 Apr 2017 22:43:14 +0000 (22:43 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61
am: a34ba7f284

Change-Id: Ib1f877ea42a1603f7b53796997fb36600873bfee

commit | commitdiff | tree

Adam Seaton [Thu, 13 Apr 2017 22:43:09 +0000 (22:43 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Thu, 13 Apr 2017 22:42:57 +0000 (22:42 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb
am: d8dbdc0809 -s ours

Change-Id: Id409cd89c262cb8b64b1141dfa6576f59786271c

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:29:53 +0000 (23:29 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50
am: d236029c61

Change-Id: I229eadd885c5a292ef0f7536b15d950251fdd3bb

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:29:47 +0000 (23:29 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:24:22 +0000 (23:24 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f
am: f84d2ddb50

Change-Id: I955feaeafb1b5a3fcc8238ca841465be5201b6ba

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:24:17 +0000 (23:24 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:18:51 +0000 (23:18 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9
am: f73b5cbd1f

Change-Id: I4c70be454a8e8cda7ede3460f78e8f3579b7a566

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:18:46 +0000 (23:18 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:13:21 +0000 (23:13 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1
am: 724c3d4bd9

Change-Id: Id141089035f48fd9548661af672d865b492b24b4

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:13:16 +0000 (23:13 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86
am: cf896d4bcb

Change-Id: Ib58f03f7346aa706508d9dc082c9661865478485

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:13:16 +0000 (23:13 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:07:49 +0000 (23:07 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01
am: 12e0186aa1

Change-Id: Idf28d646ca10ff2724c213828c8f095dc4587f5a

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:07:46 +0000 (23:07 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926
am: 2596931e86

Change-Id: I3084760ec275de17fa024379decf98303799e213

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:07:45 +0000 (23:07 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours
am: ff3f6e29e7

Change-Id: I353b3f3ed97e65d0db5f42409cb5229e42119e31

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:03:15 +0000 (23:03 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev
am: ea6878b926

Change-Id: I1fa56eef94ac1a5108303bc93b3a32ac48ec9e94

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:02:45 +0000 (23:02 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev
am: 9e63540d01

Change-Id: Id263677c0aaff9eb1839107e3c3104e314a64c33

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:02:44 +0000 (23:02 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
am: 91a21e9d12 -s ours

Change-Id: Ia3faf06a43a8c39b5a021791d2a84460539a5eb3

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:50:45 +0000 (22:50 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev

* changes:
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
[DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:49:42 +0000 (22:49 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:42:20 +0000 (22:42 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:42:15 +0000 (22:42 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:36:51 +0000 (22:36 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:36:43 +0000 (22:36 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:31:19 +0000 (22:31 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:31:13 +0000 (22:31 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:26:47 +0000 (22:26 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:26:42 +0000 (22:26 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:21:17 +0000 (22:21 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:21:12 +0000 (22:21 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:16:46 +0000 (22:16 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:16:42 +0000 (22:16 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:11:46 +0000 (22:11 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:11:42 +0000 (22:11 +0000)]

[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

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:05:45 +0000 (22:05 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404
am: 89ebb51f6b -s ours

Change-Id: Iaf0beaf284058235ce55de23a99e5adae2a4eefd

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:05:41 +0000 (22:05 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07
am: 386d7ae2e8 -s ours

Change-Id: I272f3827ce226d1bde50e7391e288436277297c2

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:00:12 +0000 (22:00 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3
am: 35e82a6404

Change-Id: Idc0ff4956a850aab3130249eb8dacfc7451ce990

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:00:09 +0000 (22:00 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07

Change-Id: I3e236b94d24700299389ae02501ef8a232dad598

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 21:55:12 +0000 (21:55 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
am: c686e139b3

Change-Id: I4a0954f6f3f75841d7eb54c6c7073ae6642d1c2a

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 21:55:10 +0000 (21:55 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
am: e6a77de43b

Change-Id: I695b346d4769e30995ea91f0e864fd95afe4866a

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 18:04:34 +0000 (11:04 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev

bug:37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:58:30 +0000 (10:58 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev

bug:37204197
Change-Id: I5c252cba4fc0ad0d605218a71da91843256c4c64

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:52:20 +0000 (10:52 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev

bug:37204197
Change-Id: Iee17fa80c5c29b439bcbe85f11526a8b89247fdf

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 18:03:48 +0000 (11:03 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev

bug:37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:57:44 +0000 (10:57 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev

bug:37204197
Change-Id: I80259eef1e7a0d0761d3bb31082b7b3606cef669

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:50:07 +0000 (10:50 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev

bug:37204197
Change-Id: Id9ee50bec46f2fd3f9e2e5f546c062f946bff36f

commit | commitdiff | tree

Adam Seaton [Mon, 10 Apr 2017 16:38:38 +0000 (09:38 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev

Bug:37204197
Change-Id: I797a8c6332a3bf62ba6ba9b17de9754e7cf5a902

commit | commitdiff | tree

Adam Seaton [Mon, 10 Apr 2017 16:36:42 +0000 (09:36 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev

Bug:37204197
Change-Id: I7b0b5428c9b1f7ea7ab3a3e272689e6324dde8af

commit | commitdiff | tree

Tao Bao [Tue, 28 Feb 2017 19:48:48 +0000 (11:48 -0800)]

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 3e6161a3b33da5a46c80c79e2d815168923e83c3)

commit | commitdiff | tree

Tao Bao [Thu, 16 Mar 2017 18:19:39 +0000 (18:19 +0000)]

Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:58:21 +0000 (16:58 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:58:15 +0000 (16:58 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:55:22 +0000 (16:55 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:55:16 +0000 (16:55 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:52:54 +0000 (16:52 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:52:46 +0000 (16:52 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:50:20 +0000 (16:50 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:50:17 +0000 (16:50 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:50:14 +0000 (16:50 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:50:13 +0000 (16:50 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:47:50 +0000 (16:47 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:47:49 +0000 (16:47 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:47:44 +0000 (16:47 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:47:44 +0000 (16:47 +0000)]

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

commit | commitdiff | tree

Tao Bao [Tue, 7 Feb 2017 19:21:17 +0000 (11:21 -0800)]

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 b31892e5de3259e5bcce3b43399f9fa7f723f81d)

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:44:50 +0000 (16:44 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:44:49 +0000 (16:44 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:44:48 +0000 (16:44 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:44:44 +0000 (16:44 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:44:44 +0000 (16:44 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:44:43 +0000 (16:44 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:41:49 +0000 (16:41 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:41:49 +0000 (16:41 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432
am: 84869ab1e2

Change-Id: I9c5be058a27139b73fb331248c682f17a9bfbfe1

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:41:47 +0000 (16:41 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:41:44 +0000 (16:41 +0000)]

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

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:41:44 +0000 (16:41 +0000)]

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

Change-Id: Ic92722bd08f326c4c7e99a36ec6b8d4ff6f4caae

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:41:44 +0000 (16:41 +0000)]

DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37
am: bb768aa837

Change-Id: Ia9e209b1b11712230b2e0ce4a968e2c119b4dd9c

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:39:19 +0000 (16:39 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487
am: e4ced7a432

Change-Id: I03e2baa012ecec53cd62d098d9b57f0f1c8b33f6

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:39:17 +0000 (16:39 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours am: 9921f826fe
am: 88ba3a3bf8 -s ours

Change-Id: I938c87c6381b0a9b3879af9ac16c85c82628d6c6

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:39:16 +0000 (16:39 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49
am: 4826d7e492 -s ours

Change-Id: Icd9c4018e5dc1b9f7857c8d3ca427381edd1beed

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:39:13 +0000 (16:39 +0000)]

DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours am: 637f66925f
am: 3481be638f -s ours

Change-Id: I65dba25b8055f2339723905b06da9723ba4b5f6a

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:39:13 +0000 (16:39 +0000)]

DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d
am: 5281508c37

Change-Id: I2b758951b7d5c496cd060621ebda3afe1b72f6ea

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:39:12 +0000 (16:39 +0000)]

DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690
am: 645af9a302 -s ours

Change-Id: I53784956ca6ec3d1b8f8585bfc547a8bfaee3f3e

commit | commitdiff | tree

Adam Seaton [Fri, 10 Mar 2017 23:44:57 +0000 (15:44 -0800)]

Update Security String to 2017-05-05 on nyc-dev

Bug:34137924

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:36:18 +0000 (16:36 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours
am: 9921f826fe

Change-Id: I5b5b9756e27e84edb95b5492140c47be3b200df0

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:36:18 +0000 (16:36 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev
am: fa157ee487

Change-Id: I417423cc171b4906dac7d0707a358b6fc85a02d9

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:36:17 +0000 (16:36 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a
am: f19c200a49

Change-Id: I2619378284b988335721a9d379efcae9e634e7a8

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:36:14 +0000 (16:36 +0000)]

DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours
am: 637f66925f

Change-Id: I16eaed880c8c82a432783565541be9292df620b4

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:36:14 +0000 (16:36 +0000)]

DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev
am: 07a0f6968d

Change-Id: I2712458e76c2d43f946130b74feb42b31d75f1f8

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:36:14 +0000 (16:36 +0000)]

DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
am: 7b35a39690

Change-Id: Iac15bfd4018b152302e13f12a0f5a05e85d010e4

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:32:46 +0000 (16:32 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
am: 3d0850957a

Change-Id: I4d62b1d3b809b1be366b649d6cd2cf036f0020b3

commit | commitdiff | tree

Adam Seaton [Thu, 16 Mar 2017 16:32:45 +0000 (16:32 +0000)]

DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev
am: baf29229ca -s ours

Change-Id: Ie6771d5808069e6285b7497b013de430d1dad818