Commit graph

74280 commits

Author SHA1 Message Date
Yi-Yo Chiang
d543bebbf7 libfs_avb: Export more utilities to facilitate VTS
Change should be no-op, it just export some private methods.

Bug: 211741246
Test: ./run_tests.sh
Test: presubmit
Change-Id: Ia4ac739018f188a0154625ec574fc4bebf7c62ee
2022-01-10 16:36:51 +08:00
Yi-yo Chiang
e23ae1ae39 Merge "Move *-gsi_avbpubkey filegroup to vts directory" am: 28d7b767a9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938281

Change-Id: I678abd1576c0493a3db73bfae3d22a5311f430ec
2022-01-10 08:33:14 +00:00
Bowgo Tsai
68c97406a2 libfs_avb: updating run_tests.sh
Adding `--host` for host-side test cases with atest, so we
still can run the test when there is no device connected.

Otherwise, TradeFed will emit the follow error:
  TradeFed subprocess exited early with exit code=7(NO_DEVICE_ALLOCATED).

Bug: None
Test: ./system/core/fs_mgr/libfs_avb/run_tests.sh
Change-Id: I0a593e6dc42861c2dc9cfff308cd7fd76b39ef2c
2022-01-10 16:26:58 +08:00
Yi-yo Chiang
28d7b767a9 Merge "Move *-gsi_avbpubkey filegroup to vts directory" 2022-01-10 08:19:43 +00:00
David Anderson
15905fdebe [automerger skipped] libsnapshot: Fix CHECK failure during second phase merge am: 739f4f5f60 -s ours
am skip reason: Merged-In I8bf00e3016546ef7039bb0b18eb977cc3dc1066a with SHA-1 dd620ccf24 is already in history

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

Change-Id: I238a46c472fcfcbd4f2baedd7730a1acb598a014
2022-01-10 03:35:53 +00:00
David Anderson
d7d520c90d [automerger skipped] libsnapshot: Propagate merge phase across merge failures. am: 6834fe66d7 -s ours
am skip reason: Merged-In I31fdae6bde48e3a71b6f3fcc663541257f7ebd8f with SHA-1 c2bb3ee6d6 is already in history

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

Change-Id: Ib3d35524f9817460b4f56369baa18d831c87ff4a
2022-01-10 03:35:51 +00:00
Devin Moore
33ad9bd473 Merge "fastboot: make copy_boot_avb_footer more generic" am: f56e0dbf33 am: 31009d55ce am: dc167e06f7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1941095

Change-Id: Ibbac19d6658c77c6b5d263871ec055193216ec6f
2022-01-07 23:03:03 +00:00
Cole Faust
eea1dadba8 Remove win_sdk
win_sdk is deprecated, if given on the command line
sdk will be build instead.

Bug: 212724080
Test: Presubmits
Change-Id: Ia92b879fe08f0a1d9ebefc90e369adf1d4aa4112
2022-01-07 14:55:54 -08:00
Devin Moore
dc167e06f7 Merge "fastboot: make copy_boot_avb_footer more generic" am: f56e0dbf33 am: 31009d55ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1941095

Change-Id: I6d515fc96c545991acbf55a1ffecc4d9bbaeb986
2022-01-07 22:54:09 +00:00
Devin Moore
31009d55ce Merge "fastboot: make copy_boot_avb_footer more generic" am: f56e0dbf33
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1941095

Change-Id: Iabf4f4201f7156ec9c192f9566a767be84432812
2022-01-07 22:33:08 +00:00
Devin Moore
f56e0dbf33 Merge "fastboot: make copy_boot_avb_footer more generic" 2022-01-07 22:13:19 +00:00
Treehugger Robot
a61dc8573f Merge "Use insert() with ranges instead of reserve" am: e664e8fb72 am: 47d6a849d1 am: 36fbb59129
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940642

Change-Id: I22b5e7712fad6d351b394a46d56555a7c9e480e3
2022-01-07 21:03:43 +00:00
Treehugger Robot
36fbb59129 Merge "Use insert() with ranges instead of reserve" am: e664e8fb72 am: 47d6a849d1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940642

Change-Id: Ie7bf8453786877f0875cf5ebd4edc4185a037b5a
2022-01-07 20:53:24 +00:00
Treehugger Robot
47d6a849d1 Merge "Use insert() with ranges instead of reserve" am: e664e8fb72
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1940642

Change-Id: I348f5f8db4b8fa5175b59bb4e6220604a684bebf
2022-01-07 20:37:16 +00:00
Treehugger Robot
e664e8fb72 Merge "Use insert() with ranges instead of reserve" 2022-01-07 20:25:00 +00:00
Devin Moore
cb5098f547 fastboot: make copy_boot_avb_footer more generic
The funciton is now used for init_boot and boot partitions, so the name
and the error messages should be more generic.

Bug: 203698939
Test: m
Change-Id: I168fdcb08accb11b2c9cfc402168744274f59665
2022-01-07 18:03:33 +00:00
Kelvin Zhang
500ed210e0 Use insert() with ranges instead of reserve
STL implementation of insert() is generally smart enough to reserve
storage before hand. No need to do reserve() followed by for each loop

Test: th
Change-Id: I36e88c121868b97ea525b292a67b36983c530e56
2022-01-07 09:55:38 -08:00
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
Yi-Yo Chiang
88e0f4abdb Move *-gsi_avbpubkey filegroup to vts directory
Bug: 176869478
Test: presubmit
Change-Id: I41cf85bb2f3b5270fcb848fc07e9145d26adcc18
2022-01-07 18:27:15 +08:00
Ken Chen
c3904fd372 Delete legacy library libqtaguid
The library has been replaced by BPF solution. No any valid user is
using this.

Bug: N/A
Test: m
Change-Id: If14ff29859b06feb5cd7d4ebed9f83ab146ea9e4
2022-01-07 18:26:25 +08: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
David Anderson
739f4f5f60 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
Bug: 213253413
Bug: 193549218
Ignore-AOSP-First: cherry-pick from AOSP
Test: vts_libsnapshot_test
Test: update_engine_unittests
Change-Id: I8bf00e3016546ef7039bb0b18eb977cc3dc1066a
Merged-In: I8bf00e3016546ef7039bb0b18eb977cc3dc1066a
2022-01-07 02:36:11 +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
555f96580a healthd: remove hridya@ from OWNERS file
Test: N/A
Bug: N/A
Change-Id: I4a8d87a7c6d9ca288afefbd5c8c9b97d6848af3f
2022-01-05 16:59:20 -08:00