Commit graph

64733 commits

Author SHA1 Message Date
Elliott Hughes
2d697d330f Merge "Fix SharedBuffer tests to pass under hwasan." 2020-10-20 18:40:43 +00:00
Treehugger Robot
8013cc3d85 Merge "libmodprobe: Fail when modules.dep lacks colon" 2020-10-20 15:45:43 +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
f70d801d4b Merge "libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader." 2020-10-19 20:58:55 +00:00
Treehugger Robot
4fdc6f1328 Merge "Migrate system/core/adb to packages/modules/adb" 2020-10-19 17:56:36 +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
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
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
Josh Gao
51d8abc846 Merge "adb: fix timeout-related test flakiness." am: fe1eba0056
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1463230

Change-Id: I8019f7d7b830b99e864d2eb6b1143f39d6f4443f
2020-10-16 22:17:13 +00:00
Treehugger Robot
7c36db1803 Merge "Load boot image props." am: ac46ab3c93
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451466

Change-Id: Ia4f869c15312f97e358d9059533326caf256279e
2020-10-16 22:16:27 +00:00
David Anderson
54231f255e Merge "libsnapshot: Partially implement OpenSnapshotWriter." am: 6c1d885150
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455356

Change-Id: I5f9e8e335a0bad690a1df9bd2948031374c20750
2020-10-16 22:15:28 +00:00
Josh Gao
fe1eba0056 Merge "adb: fix timeout-related test flakiness." 2020-10-16 20:18:45 +00:00
Treehugger Robot
ac46ab3c93 Merge "Load boot image props." 2020-10-16 19:23:08 +00:00
David Anderson
6c1d885150 Merge "libsnapshot: Partially implement OpenSnapshotWriter." 2020-10-16 19:15:51 +00:00
Palmer Dabbelt
eef49c9e3c libdm: dm-user target creation takes an additional argument
Rather than using some implicit naming scheme, we've decided to just let
userspace pick whatever control device naming scheme it wants.  This requires
an additional argument to be passed to the kernel.

Test: cow_snapuserd_test
Bug: 168259959
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Change-Id: Ibf7f378b67abb6ca7457a9fdc9b8739e3d31bee3
Signed-off-by: Akilesh Kailash <akailash@google.com>
2020-10-16 18:16:55 +00:00
Tom Cherry
2c9c8eb5ff init.rc: create /data/vendor* earlier
A recent change moved creating /data/vendor/tombstone earlier than
/data/vendor was created, which would cause /data/vendor/tombstone to
not be created until the second time a device boots, instead of the
first.

This change moves the creation of /data/vendor* earlier, allowing
/data/vendor/tombstone to be created on the first boot.

Bug: 169659307
Test: boot CF for the first time and see /data/vendor/tombstone is
      created
Change-Id: I53ee8fbc282bc533d50756ebb4cc65a5ca582088
2020-10-16 10:39:21 -07:00
Baligh Uddin
f52af4c593 Merge "Remove libprocinfo, libbacktrace, libunwindstack" am: 721825bac9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455716

Change-Id: Ic09afe267f4d82fc20809c553c53a21b4b4f9177
2020-10-16 16:51:16 +00:00
Baligh Uddin
721825bac9 Merge "Remove libprocinfo, libbacktrace, libunwindstack" 2020-10-16 15:49:44 +00:00
Baligh Uddin
ce7b63697e Remove libprocinfo, libbacktrace, libunwindstack
These projects have moved to a different location.
platform/system/core [libprocinfo] -> platform/system/libprocinfo
platform/system/core [libbacktrace] -> platform/system/unwinding [libbacktrace]
platform/system/core [libunwindstack] -> platform/system/unwinding [libunwindstack]

BUG: 163786882
Test: Local build + TH
Change-Id: Id6d278d917236df0ffd40b5c32593856e112cb5b
2020-10-16 15:46:24 +00:00
Jack Yu
9d23c2da47 Merge "Create folder to store nfc snoop data" am: b5e565d29b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1398417

Change-Id: I34161c1e1ec7f99622fcc9453178614e5899bcc2
2020-10-16 08:09:48 +00:00
Jack Yu
b5e565d29b Merge "Create folder to store nfc snoop data" 2020-10-16 07:56:10 +00:00
Josh Gao
1115e29faf adb: fix timeout-related test flakiness.
When running tests against cuttlefish, `adb root` sometimes flakes
because of a 6 second timeout in wait_for_device, which can get
triggered when adbd's restart gets throttled by init. The adb client
would notice that the socket went down, try to reconnect and fail
because adbd still hasn't started yet, and then wait up to 10 seconds to
reconnect, before which the `adb root` invocation would have failed due
to timeout. Increase the timeout to be long enough to handle this, and
also reduce the interval of reconnections to speed things up when we're
in this scenario.

Bug: http://b/170707786
Test: while true; do adb root; adb wait-for-device; adb unroot; adb wait-for-device; done
Change-Id: I140d721dfcfd635d45813a55990684a25e32228c
2020-10-15 18:46:45 -07:00
Baligh Uddin
2474aa8846 Merge "Add new path to visibility rule prior to migration." am: b2621b05a7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1462703

Change-Id: Ic345fee58259d23392e49f515db88d0d372ef0ef
2020-10-16 00:49:40 +00:00
Baligh Uddin
b2621b05a7 Merge "Add new path to visibility rule prior to migration." 2020-10-16 00:00:03 +00:00
Tom Cherry
bf71d24dbc Merge "Remove logcat, logd, and logwrapper symlinks" am: 3abb8b1485
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455624

Change-Id: I92c0f6f9b4db85faaad9b88b5b9f681b3416b7bf
2020-10-15 21:50:51 +00:00
Yifan Hong
7131b00862 Merge "health: Add CAP_BLOCK_SUSPEND" am: ae11855809
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1461183

Change-Id: I06480aeb9a2c26fa5ee33adcdca061be1ea56dc2
2020-10-15 21:50:29 +00:00
Tom Cherry
3abb8b1485 Merge "Remove logcat, logd, and logwrapper symlinks" 2020-10-15 21:25:10 +00:00
Yifan Hong
ae11855809 Merge "health: Add CAP_BLOCK_SUSPEND" 2020-10-15 20:24:17 +00:00
Yifan Hong
a68ee762f7 Load boot image props.
This change does the following:

- Create /second_stage_resources empty dir at root.
- At runtime:
  - At first stage init:
    - mount tmpfs to /second_stage_resources.
    - Copy /system/etc/ramdisk/build.prop to
      /second_stage_resources/system/etc/ramdisk/build.prop
  - At second stage init:
    - Load prop from the above path
    - umount /second_stage_resources

Test: getprop -Z
Test: getprop
Bug: 169169031

Change-Id: I18b16aa5fd42fa44686c858982a17791b2d43489
2020-10-15 13:12:52 -07:00
Baligh Uddin
ccc73dc955 Add new path to visibility rule prior to migration.
BUG: 163786882
Test: TH
Change-Id: I9ee33e64c07384cc8a238a19cf9445085cf7b94f
2020-10-15 18:37:06 +00:00
Treehugger Robot
1922b4de78 Merge "Update sysprop_library API txt" am: 34a0e57a25
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1460967

Change-Id: I2c21ef6082eeb7a552305bfcb538ce341672356d
2020-10-15 16:02:02 +00:00
Treehugger Robot
34a0e57a25 Merge "Update sysprop_library API txt" 2020-10-15 15:08:21 +00:00
David Anderson
3e68bd331e libsnapshot: Implement OnlineKernelSnapshotWriter::OpenReader.
Bug: 168554689
Test: vts_libsnapshot_test
Test: full OTA with update_device.py
Test: incremental OTA with update_device.py
Change-Id: Ic5eb99be8ab1f89070a0db231d4660e123ae3967
2020-10-14 21:41:37 -07:00
David Anderson
aca0beaf77 libsnapshot: Partially implement OpenSnapshotWriter.
This is a re-landing of the original CL, with a few changes:
 - The correct device is now returned in MapUpdateSnapshot.
 - The old API is used for tests, and the new API is only tested when
   used on a VABC device.
 - A sync() call has been added to ensure that writes to the base and
   target snapshot devices have been fully flushed. This makes
   IsPartitionUnchanged detect the MapUpdateSnapshot bug.

Implement OpenSnapshotWriter for non-compressed Virtual A/B. This is
done by adding an OnlineKernelSnapshotWriter class, which forwards all
writes to a dm-snapshot block device.

This also introduces a new ISnapshotWriter class which extends
ICowWriter, and adds features specific to libsnapshot (versus ICowWriter
which is intended only for the new COW format). The OpenSnapshotReader
call has been moved here since the writer retains all the information
needed to create the reader.

To test the new call, vts_libsnapshot_test has been modified to use
OpenSnapshotWriter.

As part of this change, all consumers of libsnapshot must now link to
libsnapshot_cow.

Bug: 168554689
Test: vts_libsnapshot_test
Test: full OTA with update_device.py
Test: incremental OTA with update_device.py
Change-Id: I90364a58902a4406a37cb14a816642c57a72bec2
2020-10-14 21:41:36 -07:00
Inseob Kim
340d28487a Update sysprop_library API txt
Internal props are no longer stored in the txt file.

Exempt-From-Owner-Approval: cherry pick

Bug: 170693240
Test: m
Change-Id: I8d30b21a18759e35382f25a0706962cebbdeb096
Merged-In: I8d30b21a18759e35382f25a0706962cebbdeb096
2020-10-15 04:04:15 +00:00
Subbaraman Narayanamurthy
28ebc23625 health: Add CAP_BLOCK_SUSPEND
Add CAP_BLOCK_SUSPEND to android.hardware.health@2.0 service so
that when epoll_wait() is waiting on uevents and timer_fd events
it can block suspend to take the necessary action. Without this
permission, eventpoll is going to ignore the flags EPOLLWAKEUP
used in health HAL or healthloop.

Bug: 169873088
Change-Id: I50d84dd853f718d46fb4f15113da032b60c34b0d
2020-10-14 12:30:19 -07:00
Yifan Hong
e49b06ecf9 Merge "Refactor: Move GSI AVB keys selection logic to common code." am: f536731e5a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1457177

Change-Id: I37afc08103486a82b1b7be1d2fa40afd5b4cb4a9
2020-10-14 18:49:22 +00:00
Yifan Hong
f536731e5a Merge "Refactor: Move GSI AVB keys selection logic to common code." 2020-10-14 18:25:31 +00:00
Colin Cross
90c57d4501 Merge "Use ro.build.version.release_or_codename to reconstruct fingerprint" am: 219b3487f8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1459042

Change-Id: Ie8e7929628ff1226d14156996bf54e41f2e813fe
2020-10-14 16:52:09 +00:00
Colin Cross
219b3487f8 Merge "Use ro.build.version.release_or_codename to reconstruct fingerprint" 2020-10-14 16:33:02 +00:00