Commit graph

68678 commits

Author SHA1 Message Date
Elliott Hughes
5dba989281 Merge "Fix SharedBuffer tests to pass under hwasan." am: 2d697d330f am: 7266e44305 am: 1c8f0bad6b am: f9ff52ef3f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466463

Change-Id: Ic03befb80608e15b21ac703810bb0a45308dcad3
2020-10-20 20:40:37 +00:00
Elliott Hughes
f9ff52ef3f Merge "Fix SharedBuffer tests to pass under hwasan." am: 2d697d330f am: 7266e44305 am: 1c8f0bad6b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466463

Change-Id: I45d171b1a1f2a9c48f945edcb074144801be6cd5
2020-10-20 20:07:00 +00:00
Elliott Hughes
1c8f0bad6b Merge "Fix SharedBuffer tests to pass under hwasan." am: 2d697d330f am: 7266e44305
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466463

Change-Id: Ieee0bbe49fc38293d58c92463c9be55dbc8652a4
2020-10-20 19:39:53 +00:00
Elliott Hughes
7266e44305 Merge "Fix SharedBuffer tests to pass under hwasan." am: 2d697d330f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1466463

Change-Id: I22d627c2c8becfc74d216f732ab949325b1f7148
2020-10-20 19:18:47 +00:00
Treehugger Robot
27468ce6a5 Merge "libmodprobe: Fail when modules.dep lacks colon" am: 8013cc3d85 am: a9e131f50b am: a29e1f0fac am: a06cff3764
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465891

Change-Id: Iacd9da3a32a73acb10e14a1434500be16d2ed4ec
2020-10-20 18:48:12 +00:00
Elliott Hughes
2d697d330f Merge "Fix SharedBuffer tests to pass under hwasan." 2020-10-20 18:40:43 +00:00
Treehugger Robot
a06cff3764 Merge "libmodprobe: Fail when modules.dep lacks colon" am: 8013cc3d85 am: a9e131f50b am: a29e1f0fac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465891

Change-Id: I3ee0ce422afd0b1f5dea35a7795b90097637f244
2020-10-20 18:25:03 +00:00
Treehugger Robot
a29e1f0fac Merge "libmodprobe: Fail when modules.dep lacks colon" am: 8013cc3d85 am: a9e131f50b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465891

Change-Id: Iadf3a6927ca45acb3dccfacc80b589f7fd2d272a
2020-10-20 18:12:29 +00:00
Treehugger Robot
a9e131f50b Merge "libmodprobe: Fail when modules.dep lacks colon" am: 8013cc3d85
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465891

Change-Id: Ib8e7cb4ced83098cadf0e125079f91104ea86727
2020-10-20 17:54:17 +00:00
Treehugger Robot
8013cc3d85 Merge "libmodprobe: Fail when modules.dep lacks colon" 2020-10-20 15:45:43 +00:00
Yifan Hong
5032cf03e4 Merge "Move GSI AVB keys to vendor_boot if BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT" am: 14096bd924 am: 502fe52153 am: 14605c0dd4 am: 13f4369763
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1457178

Change-Id: Ib7a717feb5fef7c8db8b9ecf1226e94c88e519bc
2020-10-20 04:14:29 +00:00
Yifan Hong
13f4369763 Merge "Move GSI AVB keys to vendor_boot if BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT" am: 14096bd924 am: 502fe52153 am: 14605c0dd4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1457178

Change-Id: I5f39d1c3ee7d64f22edfdfa30d2f68a2a8adab3d
2020-10-20 04:02:47 +00:00
Yifan Hong
14605c0dd4 Merge "Move GSI AVB keys to vendor_boot if BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT" am: 14096bd924 am: 502fe52153
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1457178

Change-Id: I5d1fe4c0df50344c0d305ab9a3fd5056d72fce5b
2020-10-20 03:51:41 +00:00
Yifan Hong
502fe52153 Merge "Move GSI AVB keys to vendor_boot if BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT" am: 14096bd924
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1457178

Change-Id: I5103bcff865fa7b0dba5329357a3b869385fcc9c
2020-10-20 03:39:36 +00:00
Yifan Hong
14096bd924 Merge "Move GSI AVB keys to vendor_boot if BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT" 2020-10-20 01:51:11 +00:00
Elliott Hughes
f2f016e741 Fix SharedBuffer tests to pass under hwasan.
Allocating the entire address space is sufficiently unreasonable that
hwasan blows you out of the water if you try to do that. Half the
address space feels like it's large enough to be guaranteed to fail
(which is all I think this intended to test) without being quite so
obviously incorrect that tools like hwasan are going to object...

...except hwasan actually has a 2GiB limit. So let's keep the cleanup,
but also just disable these tests if they're running under hwasan for
now.

Bug: https://issuetracker.google.com/171054277
Test: treehugger
Change-Id: I41f3def5c3a43aa7f9ca3a130b4306ebed659d6a
2020-10-19 16:51:58 -07:00
David Anderson
0fcac12dbe Merge "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." am: f70d801d4b am: 66469ee991 am: 5d4aa45cd4 am: 47ec08dc95
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455721

Change-Id: Id3261c228b1bec10f42d0f1504d32fd1b3245698
2020-10-19 22:22:26 +00:00
David Anderson
47ec08dc95 Merge "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." am: f70d801d4b am: 66469ee991 am: 5d4aa45cd4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455721

Change-Id: Ib7f5f0d06e74fa5bf29895167550c2325d15b4e6
2020-10-19 22:04:40 +00:00
David Anderson
5d4aa45cd4 Merge "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." am: f70d801d4b am: 66469ee991
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455721

Change-Id: Ibd76e48202acad2d027e78a07c7f25123c858db3
2020-10-19 21:36:22 +00:00
David Anderson
66469ee991 Merge "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." am: f70d801d4b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455721

Change-Id: I4313f1a7b5042cdc0f1216c4184e693032e58d49
2020-10-19 21:11:58 +00:00
David Anderson
f70d801d4b Merge "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." 2020-10-19 20:58:55 +00:00
Treehugger Robot
591580bd59 Merge "Migrate system/core/adb to packages/modules/adb" am: 4fdc6f1328 am: 0a5509a105 am: 085bed9e1a am: 4840e9afad
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465245

Change-Id: Ie6a425a8e659776aefa86f9cfeb3601f63d84092
2020-10-19 19:51:21 +00:00
Treehugger Robot
4840e9afad Merge "Migrate system/core/adb to packages/modules/adb" am: 4fdc6f1328 am: 0a5509a105 am: 085bed9e1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465245

Change-Id: If3b17a33b260fb9b41e7785dd8318346df2b246c
2020-10-19 19:39:59 +00:00
Treehugger Robot
085bed9e1a Merge "Migrate system/core/adb to packages/modules/adb" am: 4fdc6f1328 am: 0a5509a105
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465245

Change-Id: Icaffb8bcecf6915935f8b65d0c8236a8d813d9f8
2020-10-19 19:24:30 +00:00
Treehugger Robot
0a5509a105 Merge "Migrate system/core/adb to packages/modules/adb" am: 4fdc6f1328
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465245

Change-Id: Ie682cc7ad2721f948db7ebd410061669a0a0146c
2020-10-19 19:12:08 +00:00
Treehugger Robot
4fdc6f1328 Merge "Migrate system/core/adb to packages/modules/adb" 2020-10-19 17:56:36 +00:00
Tom Cherry
4651d3c33c Merge "init.rc: create /data/vendor* earlier" am: dd5184f858 am: 4489ee0a19 am: d54540e680 am: 33bf9f921d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464703

Change-Id: I124119425e48b643c6820c0d83f892a7b57d3b33
2020-10-19 16:12:59 +00:00
Tom Cherry
33bf9f921d Merge "init.rc: create /data/vendor* earlier" am: dd5184f858 am: 4489ee0a19 am: d54540e680
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464703

Change-Id: I1e17aa0d4c5042eb418872dc51f9559d3b1887a2
2020-10-19 16:00:13 +00:00
Tom Cherry
d54540e680 Merge "init.rc: create /data/vendor* earlier" am: dd5184f858 am: 4489ee0a19
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464703

Change-Id: I61ac3c8337b19ceee6869a3d4ba70651ec600dad
2020-10-19 15:43:22 +00:00
Tom Cherry
4489ee0a19 Merge "init.rc: create /data/vendor* earlier" am: dd5184f858
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464703

Change-Id: I50e3f2f0dc6ed9f4c1f921ca4c948fda4817fc26
2020-10-19 15:11:40 +00:00
Tom Cherry
dd5184f858 Merge "init.rc: create /data/vendor* earlier" 2020-10-19 14:57:43 +00:00
Andrew Scull
fb18f6ef05 libmodprobe: Fail when modules.dep lacks colon
The first argument in a modules.dep line must end with a colon so fail
if that condition is not met.

Test: libmodprobe_tests
Change-Id: I6f3a22758302f16b924e5a16f7af9bf35f1a56f3
2020-10-19 12:00:08 +01:00
Baligh Uddin
2767447034 Migrate system/core/adb to packages/modules/adb
Adding new path to visibility rule, as b/170958306 prevents adding
new changes to a project being introduced in the same topic.  We need to
do this ahead of the migration and then cleanup after the migration is
complete.

BUG: 167963357
Test: TH
Change-Id: Id02e4ea3a6d387bad7b2dbd5d0a38f662d0254fc
2020-10-18 15:12:29 +00:00
Baligh Uddin
460dfbe302 Merge "Remove baligh@ from owners. CodeShuffle done." am: 2abdb1eb5b am: f03237e1d6 am: 690f727138 am: 720d4581d5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464717

Change-Id: I08a173fccb28df162e312f017e6775f57328ce0c
2020-10-17 14:08:11 +00:00
Baligh Uddin
720d4581d5 Merge "Remove baligh@ from owners. CodeShuffle done." am: 2abdb1eb5b am: f03237e1d6 am: 690f727138
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464717

Change-Id: Ib93a553ebbe8643ac6b99ede0e6ff65f94e4fcbf
2020-10-17 13:56:30 +00:00
Baligh Uddin
690f727138 Merge "Remove baligh@ from owners. CodeShuffle done." am: 2abdb1eb5b am: f03237e1d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464717

Change-Id: Ib4b4392af5a6bd4d2d2a13718b3ec3f017f61bbf
2020-10-17 13:45:19 +00:00
Baligh Uddin
f03237e1d6 Merge "Remove baligh@ from owners. CodeShuffle done." am: 2abdb1eb5b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1464717

Change-Id: Ibfdbe7671eb194da34adec7b10bfb326bdc6914b
2020-10-17 13:12:07 +00:00
Baligh Uddin
2abdb1eb5b Merge "Remove baligh@ from owners. CodeShuffle done." 2020-10-17 12:42:03 +00:00
Akilesh Kailash
3bc1c93a8a Merge "Integrate snapuserd with dm-user ABI changes." am: e9cb85def4 am: 2e976d15b2 am: b47f7e8d9d am: 11929dbffa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1460962

Change-Id: I1e11988fc2011e0c53135232008b8e828b68db54
2020-10-17 02:05:16 +00:00
Akilesh Kailash
de81ab1089 Merge "libdm: dm-user target creation takes an additional argument" am: ba0b4bb900 am: 04f62185f2 am: 1f98ef3a53 am: 1f4f88a5c3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455620

Change-Id: I74179740479c4d6ee2b7fd2354d91e1472ee0346
2020-10-17 02:04:50 +00:00
Akilesh Kailash
11929dbffa Merge "Integrate snapuserd with dm-user ABI changes." am: e9cb85def4 am: 2e976d15b2 am: b47f7e8d9d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1460962

Change-Id: I78b2d24ee884195eda4e723d176388c03ebb3cbe
2020-10-17 01:52:39 +00:00
Akilesh Kailash
1f4f88a5c3 Merge "libdm: dm-user target creation takes an additional argument" am: ba0b4bb900 am: 04f62185f2 am: 1f98ef3a53
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455620

Change-Id: Id344c7c114a1c99bb5b0be8d1105effb1064b5d4
2020-10-17 01:52:14 +00:00
Akilesh Kailash
b47f7e8d9d Merge "Integrate snapuserd with dm-user ABI changes." am: e9cb85def4 am: 2e976d15b2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1460962

Change-Id: Ibfea4ea74d3f64b6fc35a604392ea78e4e7ade4a
2020-10-17 01:38:04 +00:00
Akilesh Kailash
1f98ef3a53 Merge "libdm: dm-user target creation takes an additional argument" am: ba0b4bb900 am: 04f62185f2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455620

Change-Id: Ia9c96100e652860751fee98dfab61437792f12b1
2020-10-17 01:37:58 +00:00
Akilesh Kailash
2e976d15b2 Merge "Integrate snapuserd with dm-user ABI changes." am: e9cb85def4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1460962

Change-Id: I8a380496653e88c38bf71af360983e11d79c9472
2020-10-17 01:13:15 +00:00
Akilesh Kailash
04f62185f2 Merge "libdm: dm-user target creation takes an additional argument" am: ba0b4bb900
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455620

Change-Id: I1df8aa37b063a64cb870abbb28043b334af19d5f
2020-10-17 01:13:00 +00:00
Akilesh Kailash
e9cb85def4 Merge "Integrate snapuserd with dm-user ABI changes." 2020-10-17 00:41:58 +00:00
Akilesh Kailash
b03e4cdccd Integrate snapuserd with dm-user ABI changes.
Create loopback device to simulate system_a/product_a partitions
to test IO path.

Bug: 168259959
Test: cow_snapuserd_test

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I9f2a311d3eccfa20c82d0ebdb3e028ea3323a48d
2020-10-17 00:41:44 +00:00
Akilesh Kailash
ba0b4bb900 Merge "libdm: dm-user target creation takes an additional argument" 2020-10-17 00:41:28 +00:00
Baligh Uddin
2ac7ea47f6 Remove baligh@ from owners. CodeShuffle done.
BUG: 163786882
Test: TH
Change-Id: Ia06a79da7ee7907185979fe49f298a75475c2c84
2020-10-17 00:28:10 +00:00