Commit graph

74207 commits

Author SHA1 Message Date
Devin Moore
fb99fd1756 Merge changes Ib5a63a7b,If00f581a am: 12e5f038a9 am: c913a4781b am: 517364d305
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938910

Change-Id: Idb325c8a22b6e32a6ec725eb22507232b2a50af4
2022-01-07 17:12:38 +00:00
Devin Moore
517364d305 Merge changes Ib5a63a7b,If00f581a am: 12e5f038a9 am: c913a4781b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938910

Change-Id: I2fbaca7f56a21e8991aa99d4c0675266bb3b81f8
2022-01-07 16:56:45 +00:00
Devin Moore
c913a4781b Merge changes Ib5a63a7b,If00f581a am: 12e5f038a9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938910

Change-Id: I3bb41a66de6fc6a1496fb0750b2721970ffe378d
2022-01-07 16:36:04 +00:00
Devin Moore
12e5f038a9 Merge changes Ib5a63a7b,If00f581a
* changes:
  fastboot: copy AVB footer from init_boot.img to end of partition
  fastboot: Support flashing init_boot.img into init_boot partition
2022-01-07 16:24:13 +00:00
Hridya Valsaraju
f8064dadf0 Merge "fastboot: Add elsk@ to OWNERS file" am: cecdf78a1f am: a24c68a4af am: fdb6f20ed8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940029

Change-Id: Ia2f905dc938559840674c21344f4ca69793a836b
2022-01-07 14:27:26 +00:00
Hridya Valsaraju
fdb6f20ed8 Merge "fastboot: Add elsk@ to OWNERS file" am: cecdf78a1f am: a24c68a4af
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940029

Change-Id: I1e8331f3048b6a82ee3ba04bcb78605699da6e1e
2022-01-07 14:00:37 +00:00
Hridya Valsaraju
a24c68a4af Merge "fastboot: Add elsk@ to OWNERS file" am: cecdf78a1f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940029

Change-Id: I1483bdd7e07623389af846269a014f250bff5a11
2022-01-07 13:40:24 +00:00
Hridya Valsaraju
cecdf78a1f Merge "fastboot: Add elsk@ to OWNERS file" 2022-01-07 13:15:41 +00:00
Treehugger Robot
102efabc62 Merge "healthd: remove hridya@ from OWNERS file" am: 836eed37fb am: 5732718dff am: a79f8922f1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940032

Change-Id: I95b1d8cfc6005b5ab356ebc4470fbebcf8d3f203
2022-01-07 04:00:09 +00:00
Treehugger Robot
a79f8922f1 Merge "healthd: remove hridya@ from OWNERS file" am: 836eed37fb am: 5732718dff
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940032

Change-Id: I5932f28a845cb39f4675448576ef07ad5ab3c2d7
2022-01-07 03:48:30 +00:00
Treehugger Robot
5732718dff Merge "healthd: remove hridya@ from OWNERS file" am: 836eed37fb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940032

Change-Id: If4a17f1bf311452a21438a82bef89816d7fef9b8
2022-01-07 03:30:26 +00:00
Treehugger Robot
836eed37fb Merge "healthd: remove hridya@ from OWNERS file" 2022-01-07 03:13:44 +00:00
Hridya Valsaraju
dcdb160411 healthd: remove hridya@ from OWNERS file
Test: N/A
Bug: N/A
Change-Id: Iffa783ea22d278c50df0c7a87f7f265c26a5c7c1
2022-01-06 16:56:57 -08:00
David Anderson
5cd96a186e Merge "libsnapshot: Fix CHECK failure during second phase merge" am: 856f69bead am: cdac1c86af am: e84b260dc7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1936674

Change-Id: Id92e8cfab4bffff61213974beacd0ddb3849477c
2022-01-07 00:35:44 +00:00
David Anderson
e84b260dc7 Merge "libsnapshot: Fix CHECK failure during second phase merge" am: 856f69bead am: cdac1c86af
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1936674

Change-Id: I2020794ff35d152425a5fa3a2d07662dd3f6d642
2022-01-07 00:23:44 +00:00
David Anderson
cdac1c86af Merge "libsnapshot: Fix CHECK failure during second phase merge" am: 856f69bead
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1936674

Change-Id: Ibd5dcad8674653db5130a7b9adf17d0a190e52ae
2022-01-07 00:08:46 +00:00
David Anderson
856f69bead Merge "libsnapshot: Fix CHECK failure during second phase merge" 2022-01-06 23:54:42 +00:00
Hridya Valsaraju
8fb1aa982b fastboot: Add elsk@ to OWNERS file
Also, remove hridya@ from the OWNERS file

Test: N/A
Bug: N/A
Change-Id: I1d5a03ebf9e2e93f555474a6a654e16879b8e96a
2022-01-06 15:29:17 -08:00
Devin Moore
1af1202fbd fastboot: copy AVB footer from init_boot.img to end of partition
Similar to GKI boot.img, init_boot.img is released as a specific size
and should be able to be flashed into partitions that have different
sizes. So the AVB footer is moved from the end of the init_boot.img to
the end of the partition in the case that the partition is larger than
the image.

Bug: 203698939
Test: m
Change-Id: Ib5a63a7bf1b4be4eba4941972750f12e3edb3a17
2022-01-06 22:33:19 +00:00
Devin Moore
dd1eb8733d fastboot: Support flashing init_boot.img into init_boot partition
init_boot_a and init_boot_b partitions are used in A/B devices.

Bug: 203698939
Test: m

Change-Id: If00f581ab7ae340d78d7d55eebafd92ac15d2bc1
2022-01-06 22:32:28 +00:00
Hridya Valsaraju
219ec3692c Merge "libsync: remove hridya@ from OWNERS file" am: b910961c16 am: d667a043b5 am: b3c1bec59d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935472

Change-Id: I4aef83eaa86e6718c3736cf231d1938d21a1b76d
2022-01-06 19:36:02 +00:00
Hridya Valsaraju
b3c1bec59d Merge "libsync: remove hridya@ from OWNERS file" am: b910961c16 am: d667a043b5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935472

Change-Id: Ia663ccad3f8ee201a27261e9a7d2ad5d6b589f71
2022-01-06 19:24:28 +00:00
Hridya Valsaraju
d667a043b5 Merge "libsync: remove hridya@ from OWNERS file" am: b910961c16
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935472

Change-Id: Ib6701b1f880cb6f3fc6804fabbfcbfd8c456e299
2022-01-06 19:05:23 +00:00
Hridya Valsaraju
b910961c16 Merge "libsync: remove hridya@ from OWNERS file" 2022-01-06 18:49:55 +00:00
David Anderson
dd620ccf24 libsnapshot: Fix CHECK failure during second phase merge
This CHECK prevents a release build from resuming a two-phase merge if
the merge initially failed in the first pass.

Bug: 213031779
Test: vts_libsnapshot_test
Test: update_engine_unittests
Change-Id: I8bf00e3016546ef7039bb0b18eb977cc3dc1066a
2022-01-06 04:32:39 +00:00
Josh Yang
d198b3ffa3 Merge "Create /data/bootanim folder in init.rc." am: 30981724d0 am: d6c0dc55b5 am: a7b968b83d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932960

Change-Id: If9d23d921a5c32a32757d7989c2c0e8cf300c565
2022-01-06 04:01:29 +00:00
Josh Yang
a7b968b83d Merge "Create /data/bootanim folder in init.rc." am: 30981724d0 am: d6c0dc55b5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932960

Change-Id: Ib250029bdf74fce8e364466285a0b102483fdfc2
2022-01-06 03:42:42 +00:00
Josh Yang
d6c0dc55b5 Merge "Create /data/bootanim folder in init.rc." am: 30981724d0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932960

Change-Id: I141b34a8c82de940f3d663d049c7ce7815ae319a
2022-01-06 03:32:03 +00:00
Josh Yang
30981724d0 Merge "Create /data/bootanim folder in init.rc." 2022-01-06 03:17:58 +00:00
Hridya Valsaraju
9e6842258a libsync: remove hridya@ from OWNERS file
Test: N/A
Bug: N/A
Change-Id: I3f816efad4520507cacc635457d363d65bc7942e
2022-01-05 16:59:03 -08:00
Keith Mok
1caca3cf4f Merge changes I75017420,I3612e131 am: e3f4b84468 am: de50c0081b am: 8249a06f5f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935479

Change-Id: I5d8407336e1c8ceb7fe2f99c4f2b00e93571a8de
2022-01-06 00:39:16 +00:00
Keith Mok
8249a06f5f Merge changes I75017420,I3612e131 am: e3f4b84468 am: de50c0081b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935479

Change-Id: Ib6fc84794c8273affb34886a6d5e9d19f477dd57
2022-01-06 00:27:07 +00:00
Keith Mok
de50c0081b Merge changes I75017420,I3612e131 am: e3f4b84468
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935479

Change-Id: I61e02fb220fe60da1a80a3fa8f2b92a42412e0d8
2022-01-06 00:09:14 +00:00
Keith Mok
e3f4b84468 Merge changes I75017420,I3612e131
* changes:
  Fix userspace fastboot with fuzzy test
  Fix fuzzy test on too large command
2022-01-05 23:50:12 +00:00
Nikita Ioffe
4d7b4f680b [automerger skipped] Deflake libdm#CreateEmptyDevice test am: 654bb5225b -s ours
am skip reason: Merged-In I8a74375631b20c14a32a41dbaf38380ebc0078e6 with SHA-1 7756779289 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/16561671

Change-Id: I76b69ac3c6816f5aa5e6f8f8c292bb53162993a4
2022-01-05 21:28:31 +00:00
Keith Mok
2cb6728252 Merge "Fix typo in fuzzy_fastboot README" am: ba31ce8655 am: d4213a2167 am: 2c40bc3cc1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935477

Change-Id: Ib524c47c17692441a5cc990b25af9f4eef4281a1
2022-01-05 19:37:26 +00:00
Keith Mok
2c40bc3cc1 Merge "Fix typo in fuzzy_fastboot README" am: ba31ce8655 am: d4213a2167
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935477

Change-Id: I4e487b2d65a1a9c88d091c6d8e8713341ca93096
2022-01-05 19:19:55 +00:00
Rafay Kamran
9d1d5c1bee Merge changes from topic "revert-1935201-OUHHJQVSHH" am: 416cda9bc7 am: aeb2b5871e am: 28d2cbbc4c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1934983

Change-Id: Ie1934a4c2c467d9daa94279631eb3ac276178485
2022-01-05 19:13:46 +00:00
Yi Kong
f0b2856126 Merge "Enable afdo for libutils" am: fe9b4ed7b8 am: 47707fb6fc am: 53b3b69bda
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932625

Change-Id: Iad922fce03403621a20873493f6fb979eec52535
2022-01-05 19:13:00 +00:00
David Anderson
525cfc294e Merge "Remove support for AVB 1.0." am: 58e554e7ed am: 05f0e531c7 am: f0ee05bf16
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1876217

Change-Id: I017b8e645a825a3f00c846011df4cca4da6697ff
2022-01-05 19:12:39 +00:00
Keith Mok
d4213a2167 Merge "Fix typo in fuzzy_fastboot README" am: ba31ce8655
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935477

Change-Id: Ib0da2feebdbfca35674f15d603de1330d8a8c09b
2022-01-05 19:00:52 +00:00
Keith Mok
ba31ce8655 Merge "Fix typo in fuzzy_fastboot README" 2022-01-05 18:43:16 +00:00
Rafay Kamran
28d2cbbc4c Merge changes from topic "revert-1935201-OUHHJQVSHH" am: 416cda9bc7 am: aeb2b5871e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1934983

Change-Id: Ia5b11e3db9f481ca825f437d78b579063d600c11
2022-01-05 16:10:07 +00:00
Rafay Kamran
aeb2b5871e Merge changes from topic "revert-1935201-OUHHJQVSHH" am: 416cda9bc7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1934983

Change-Id: I4d2d674e75665a5e45d5c78a4760409cc45b7336
2022-01-05 15:53:54 +00:00
Rafay Kamran
416cda9bc7 Merge changes from topic "revert-1935201-OUHHJQVSHH"
* changes:
  Revert "libsnapshot: Fix checks for compression to work with new..."
  Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
2022-01-05 15:38:53 +00:00
Rafay Kamran
146f07e07b Revert "libsnapshot: Fix checks for compression to work with new..."
Revert submission 1935201

Reason for revert: DroidMonitor: Potential culprit for Bug http://b/213259099 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
I219f956ba:libsnapshot: Fix libsnapshot_fuzzer_test.
I281937e26:libsnapshot: Fix checks for compression to work wi...

Change-Id: I88955a533ce7103111509785ed5bb40e1779b130
2022-01-05 14:55:37 +00:00
Rafay Kamran
f140d4d584 Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
Revert submission 1935201

Reason for revert: DroidMonitor: Potential culprit for Bug http://b/213259099 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
I219f956ba:libsnapshot: Fix libsnapshot_fuzzer_test.
I281937e26:libsnapshot: Fix checks for compression to work wi...

Change-Id: I33731556761cbdf603424fda94117973d3f21e21
2022-01-05 14:55:29 +00:00
Yi Kong
53b3b69bda Merge "Enable afdo for libutils" am: fe9b4ed7b8 am: 47707fb6fc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932625

Change-Id: Id8816216bbf7355e8726a992a85b3db83419fc24
2022-01-05 06:27:57 +00:00
Yi Kong
47707fb6fc Merge "Enable afdo for libutils" am: fe9b4ed7b8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932625

Change-Id: I3a507cfa670b1e8d30eef3f83fdf10573c72364a
2022-01-05 06:16:10 +00:00
Yi Kong
fe9b4ed7b8 Merge "Enable afdo for libutils" 2022-01-05 06:00:25 +00:00