Commit graph

69138 commits

Author SHA1 Message Date
Christian Wailes
4607566356 Merge "Added ARTD user" am: 8ef7d82213 am: dc76ce73cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664781

Change-Id: Ie046181c0c319e5b16500dfa2917fd67086767c9
2021-04-28 19:47:59 +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
ee2cb68b2d Merge changes from topic "debug_ramdisk_path" am: c4a1a32e91 am: d6fbaa0945
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687907

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

Change-Id: I9ae81fb5ec250f4eae5f725662c8f356550a716a
2021-04-28 18:41:44 +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
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
67d6fba44b Merge "libprocessgroup: Fix warnings when legacy schedtune cgroup is absent" am: 3b0ec907f7 am: 60750f31d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1685992

Change-Id: Ie2411efcac25c12b2f5d75c12823b7104b718a60
2021-04-27 10:36:22 +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
5028327b08 Merge "Replace llndk_library with llndk clause in cc_library" am: e52de760db am: 77e5d8b1d4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684207

Change-Id: Icccd9f0746bc75cd1be9585850d74e040b24d8e9
2021-04-27 01:36:31 +00: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
1582613ab5 Merge "Add new dm-verity error handling mode" am: 26e5d8f1e2 am: fdb4d18043
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675559

Change-Id: Ia121ca1c13b594ad9e477ed33ccb97635826b54f
2021-04-23 04:24:10 +00: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
11f3ed6133 Merge "[Bugfix]Fix userspace-reboot failure when backing_dev exists but zram not swapped on" am: 23a50b3860 am: bce0c15f3f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1674154

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

Change-Id: I37694e2c4be0f6537c79af43696a4193dfddc7d0
2021-04-23 00:49:38 +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
752460e62d Merge "Prevent debugfs unmount on debug builds with a persist property" am: 6e784c5503 am: 8b6e5c8b50
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1674966

Change-Id: I0f29ab97a3c352506e54ba565b2a3387309a2c43
2021-04-22 22:21:34 +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
e2fef0f0b1 Merge "Use libgtest_prod_headers." am: 9596d062f5 am: 740ea32939
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1682246

Change-Id: If45f75babf0f901d8e1c61f594900118d01483d8
2021-04-22 13:12:28 +00:00
satayev
e71ac65fc8 Merge "Don't generate /etc/classpath in make." am: 51dceaa999 am: 9f5a2cedc8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1649374

Change-Id: I1bf46ac22ab5b42bcbf4f973f0b492dcb2f69375
2021-04-22 13:11:21 +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
27d21c53c5 Merge "Move qemu_pipe into the vhal" am: d684952fa7 am: b2b431492b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670565

Change-Id: Ieaf814db28746a31769be4c32c97f79553f6dcd2
2021-04-22 00:07:11 +00: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
d61e073a6a Merge "init: apexd is started in the current mount namespace" am: 778f2b6837 am: fe5f60d051
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1680266

Change-Id: Iea6877489c7a9212372d14668ef22fb4c8c8347f
2021-04-21 06:15:16 +00: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
Christopher Ferris
88c3a14b6d Merge "Allow another prctl call." am: 8711f72835 am: 8eb74b032e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1678266

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

Change-Id: I841a1266c880fa176b8e6372d34f4523592ea8b8
2021-04-20 17:11:24 +00: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