Commit Graph

68801 Commits

Author SHA1 Message Date
Steven Moreland 246739cc61 Merge "libutils: sharedbuffer test - expect greatness!" am: 9dd80b6b04
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1688812

Change-Id: Id8d62f4aca69d9519a303e00a89c33a791028d5f
2021-04-28 21:21:12 +00:00
Steven Moreland 9dd80b6b04 Merge "libutils: sharedbuffer test - expect greatness!" 2021-04-28 20:28:09 +00:00
David Anderson 94b0b7ac4b Merge "libsnapshot: Add a merge failure code to SnapshotMergeReport." am: d5349dcf6d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1676193

Change-Id: Idf9ae2499807ff4ee14947db7c7cdd4bd44fe5ce
2021-04-28 19:55:15 +00:00
David Anderson d5349dcf6d Merge "libsnapshot: Add a merge failure code to SnapshotMergeReport." 2021-04-28 19:39:34 +00:00
Christian Wailes dc76ce73cf Merge "Added ARTD user" am: 8ef7d82213
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664781

Change-Id: I13a65b78f5579a6c576231b728da4898f68d4dfc
2021-04-28 19:22:00 +00:00
Treehugger Robot d6fbaa0945 Merge changes from topic "debug_ramdisk_path" am: c4a1a32e91
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687907

Change-Id: Id6beaf51a211f89b6487ef426335f0fd29fe595c
2021-04-28 18:20:17 +00:00
Bowgo Tsai 20a73996fa init: loading debug resources before chroot into first_stage_ramdisk am: 64e92f946f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684655

Change-Id: Idedf53ec0e74a1fd12f4b883a7605200561d5ff3
2021-04-28 18:19:47 +00:00
Steven Moreland 128826ca07 libutils: sharedbuffer test - expect greatness!
This test previously expected failure - a machine which does not have
2GiB of memory. However, while today is becoming the past,
2GiB allocations working is no longer a dream of the future!

Fixes: 186569165
Test: libutils_test
Change-Id: I6a9ed608c0989d415b4e7735b8a451b8928b4083
2021-04-28 17:15:58 +00:00
Christian Wailes 8ef7d82213 Merge "Added ARTD user" 2021-04-28 16:41:09 +00:00
Treehugger Robot c4a1a32e91 Merge changes from topic "debug_ramdisk_path"
* changes:
  init: adding fallback paths for debug ramdisk
  init: loading debug resources before chroot into first_stage_ramdisk
2021-04-28 16:27:34 +00:00
Treehugger Robot 60750f31d6 Merge "libprocessgroup: Fix warnings when legacy schedtune cgroup is absent" am: 3b0ec907f7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1685992

Change-Id: I8e69dbc750fea71b29fb267447df4b28e972a3f2
2021-04-27 10:11:58 +00:00
Treehugger Robot 3b0ec907f7 Merge "libprocessgroup: Fix warnings when legacy schedtune cgroup is absent" 2021-04-27 09:00:54 +00:00
Bowgo Tsai 6cb4311f4d init: adding fallback paths for debug ramdisk
Currently the gki_4_19_pixel5 presubmit test uses an old
vendor_boot-debug.img from a release branch. Adding fallback
paths to load debug resources from /first_stage_ramdisk dir to
pass the presubmit.

This CL should be reverted later once the vendor_boot-debug.img
gets updated to store the debug resources on the root dir.

Bug: 186082603
Test: boot a device with boot-debug.img
Test: boot a device with vendor_boot-debug.img
Change-Id: I9fcd77fc5a60a15cff254e432e05f1c9122ad80d
2021-04-27 15:25:31 +08:00
Bowgo Tsai 64e92f946f init: loading debug resources before chroot into first_stage_ramdisk
Currently the debug resources might under /first_stage_ramdisk/*
of the ramdisk, if there is androidboot.force_normal_boot=1 in the
kernel cmdline to request init chroot into /first_stage_ramdisk dir.

To make a generic boot-debug.img works on devices with and without
this chroot, moving the debug resources to the root of the ramdisk.
And copy them for later use before the chroot.

Bug: 186082603
Test: boot a device with boot-debug.img
Test: boot a device with vendor_boot-debug.img
Change-Id: I052a92b2d26c7fdf749991fc55015ff68743efc2
2021-04-27 15:25:18 +08:00
Colin Cross 77e5d8b1d4 Merge "Replace llndk_library with llndk clause in cc_library" am: e52de760db
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684207

Change-Id: I1b30123fffb1caf263ef119ccc92304117f1e9cd
2021-04-27 01:02:39 +00:00
Colin Cross e52de760db Merge "Replace llndk_library with llndk clause in cc_library" 2021-04-27 00:32:44 +00:00
Suren Baghdasaryan e3d38969aa libprocessgroup: Fix warnings when legacy schedtune cgroup is absent
Issue a warning about missing cpu/schedtune controller only if both of
them are missing.

Bug: 185437398
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I3a9d3c9a8c91c8d2c5346bcb431bb0407c64a811
2021-04-26 09:28:08 -07:00
Treehugger Robot fdb4d18043 Merge "Add new dm-verity error handling mode" am: 26e5d8f1e2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675559

Change-Id: I8a15b219771989f19488450650c6fec85e26c508
2021-04-23 04:04:11 +00:00
Treehugger Robot 26e5d8f1e2 Merge "Add new dm-verity error handling mode" 2021-04-23 03:35:01 +00:00
Treehugger Robot bce0c15f3f Merge "[Bugfix]Fix userspace-reboot failure when backing_dev exists but zram not swapped on" am: 23a50b3860
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1674154

Change-Id: I76c0637965f95c9d3027c4bfc89ac0b9cbb3f384
2021-04-23 00:29:52 +00:00
Treehugger Robot c7a2eb6388 Merge "Add function CleanupOldScratchFiles symmetrically" am: 2e5e490d60
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1682488

Change-Id: I718aac4e99bc571b402549e172542396f4f0c031
2021-04-23 00:29:35 +00:00
Treehugger Robot 23a50b3860 Merge "[Bugfix]Fix userspace-reboot failure when backing_dev exists but zram not swapped on" 2021-04-23 00:28:49 +00:00
Treehugger Robot 2e5e490d60 Merge "Add function CleanupOldScratchFiles symmetrically" 2021-04-23 00:14:09 +00:00
Treehugger Robot 8b6e5c8b50 Merge "Prevent debugfs unmount on debug builds with a persist property" am: 6e784c5503
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1674966

Change-Id: I863db5fb14884734dcaea54ed3912d0158b249ec
2021-04-22 22:02:26 +00:00
Treehugger Robot 6e784c5503 Merge "Prevent debugfs unmount on debug builds with a persist property" 2021-04-22 21:43:18 +00:00
Treehugger Robot 740ea32939 Merge "Use libgtest_prod_headers." am: 9596d062f5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1682246

Change-Id: Iae64ebce1f37811246bfcef2529de258567d3670
2021-04-22 12:58:01 +00:00
Treehugger Robot 9596d062f5 Merge "Use libgtest_prod_headers." 2021-04-22 12:49:36 +00:00
satayev 9f5a2cedc8 Merge "Don't generate /etc/classpath in make." am: 51dceaa999
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1649374

Change-Id: I701a1a45ce887670685d001b5b90815e8b8e1e78
2021-04-22 12:48:49 +00:00
satayev 51dceaa999 Merge "Don't generate /etc/classpath in make." 2021-04-22 12:17:56 +00:00
Artur Satayev 1acd663e96 Don't generate /etc/classpath in make.
Soong generates classpaths.proto config and puts it into
/system/etc/classpaths/ for derive_classpath to read at runtime. There
is no need to plumb these values via make anymore.

Bug: 180105615
Test: m && launch_cvd; presubmit / DeviceBootTest
Change-Id: I514c5036871233ae865b972effea8321dbe4aea9
2021-04-22 12:17:49 +00:00
Colin Cross 176ec1b805 Replace llndk_library with llndk clause in cc_library
Remove the vestigial llndk_library modules and replace them with
properties in the llndk clause of the implementation cc_library.

Bug: 170784825
Test: m checkbuild
Test: compare out/soong/build.ninja
Change-Id: Ie3a1bffcf29bb1b6747f7f708826c61bd43ba5a1
2021-04-21 19:13:41 -07:00
Roman Kiryanov b2b431492b Merge "Move qemu_pipe into the vhal" am: d684952fa7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670565

Change-Id: Iebf864de563c597dbb1dcbbc119eb9102630456f
2021-04-21 23:47:08 +00:00
Roman Kiryanov d684952fa7 Merge "Move qemu_pipe into the vhal" 2021-04-21 23:05:40 +00:00
Jintao Zhu 84822c8d51 Add function CleanupOldScratchFiles symmetrically
For symmetry, add function CleanupOldScratchFiles in conditional compilation blocks which missing it.

Test: monkey test for one day and one night

Signed-off-by: Jintao Zhu <zhujtcsieee@gmail.com>

Change-Id: Ie754427334c9a9bb7cfed70df45f439c60c9ab16
2021-04-21 14:42:11 +08:00
Treehugger Robot fe5f60d051 Merge "init: apexd is started in the current mount namespace" am: 778f2b6837
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1680266

Change-Id: Idad0e1d4fbe834c754e7241a3c15b6a2ff2dc2ed
2021-04-21 05:53:19 +00:00
Treehugger Robot 778f2b6837 Merge "init: apexd is started in the current mount namespace" 2021-04-21 05:32:26 +00:00
Elliott Hughes 02a83245ef Use libgtest_prod_headers.
Bug: http://b/185916167
Test: treehugger
Change-Id: I9ece5926944b8c881e3a117cda2c99281c59b61e
2021-04-20 15:22:02 -07:00
David Anderson 57c881ebf0 libsnapshot: Add a merge failure code to SnapshotMergeReport.
Bug: 185290850
Test: builds
Change-Id: I56e9e4c8943e420163b2c663c0136d37a45455e4
2021-04-20 13:07:31 -07:00
Christopher Ferris 8eb74b032e Merge "Allow another prctl call." am: 8711f72835
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1678266

Change-Id: Id93a5f166648f861fb1331c755a72bc9dc8ff2b0
2021-04-20 16:52:14 +00:00
David Anderson 161320e2c4 Merge "libsnapshot: Add a merge failure code to the update state." am: 53a06bffe1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673808

Change-Id: I41e533a326c4a865333b06e5fb4b3d6cfe4d6ce5
2021-04-20 16:49:45 +00:00
Christopher Ferris 8711f72835 Merge "Allow another prctl call." 2021-04-20 16:38:48 +00:00
David Anderson 53a06bffe1 Merge "libsnapshot: Add a merge failure code to the update state." 2021-04-20 16:20:48 +00:00
Jooyung Han e5232a71b2 init: apexd is started in the current mount namespace
init starts services in "bootstrap" mount namespace until the "default"
mount namespace is ready even when init's current mount namespace is
"default".

apexd and linkerconfig are those processes to set up the mount
namespaces: apexd activates apexes and linkerconfig generates linker
configs.

Previously apexd is allowed to be started in the "current" namespace by
checking its "service name"(it should be "apexd"). But there can be a
certain environment apexd is started in a different way. For example, in
microdroid, apexd is started using "exec -- /system/bin/apexd --vm"
because it wants to run in a different execution mode.

So, instead of checking the service name, its executable's path is
checked against to allow apexd to be started in the current mount
namespace.

Bug: 179342589
Test: MicrodroidTestCase (microdroid boots)
Test: cuttlefish boots
Change-Id: I7c2490e15d481c28ddf382d2d3fdf58a78e467ec
2021-04-20 22:50:12 +09:00
Yo Chiang 1fd59d60e7 Merge "Fix CtsFsMgrTestCases" am: a7e2bbd5f4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1679760

Change-Id: Iec169f6c3fd88b47bd148b61aeeae56a62fbfbcc
2021-04-20 09:09:24 +00:00
Yo Chiang a7e2bbd5f4 Merge "Fix CtsFsMgrTestCases" 2021-04-20 08:43:23 +00:00
Yi-Yo Chiang f61cb30c27 Fix CtsFsMgrTestCases
As ReadFstabFromFile() may append / remove / modify the fstab read from
the file, we cannot make assumptions about the number of fstab entries.
We can however test that the returned fstab contains at least the
entries we expect.

Fixes: 185826755
Test: atest CtsFsMgrTestCases on GSI & DSU
Change-Id: I539e7eed3f7ae14db7e9983bed7f68754c9fff39
2021-04-20 14:56:41 +08:00
Treehugger Robot 1e37df0d63 Merge "Rename ro.product.enforce_debugfs_restriction appropriately" am: 79cd46d1e9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1677036

Change-Id: I2cc662408a417a658c7f2507f8fd94591b29be5e
2021-04-20 06:32:22 +00:00
Treehugger Robot 79cd46d1e9 Merge "Rename ro.product.enforce_debugfs_restriction appropriately" 2021-04-20 06:07:53 +00:00
Treehugger Robot 1cc7c7e96b Merge "Use the new more inclusive command-line options." am: 6cf40a61dd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1679788

Change-Id: I1bef60a67a1886e85dca17a52c6197d12b63fa74
2021-04-19 21:33:35 +00:00
Treehugger Robot 6cf40a61dd Merge "Use the new more inclusive command-line options." 2021-04-19 20:57:19 +00:00