Commit graph

68781 commits

Author SHA1 Message Date
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
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
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
Treehugger Robot
86ab07a8d2 Merge "Use the new more inclusive command-line options." am: 661ba03bd6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1679789

Change-Id: I0804a6e12b590f18a9b3253253ea1d6f19c1e65b
2021-04-19 19:24:36 +00:00
Treehugger Robot
661ba03bd6 Merge "Use the new more inclusive command-line options." 2021-04-19 18:50:59 +00:00
Joel Galenson
a29a23a466 Use the new more inclusive command-line options.
Test: Compile
Change-Id: I574334b0c12759774b2d8c1671eb4ebc25d160b5
2021-04-19 09:20:30 -07:00
Joel Galenson
b453e63715 Use the new more inclusive command-line options.
Test: Compile
Change-Id: I31a33d5432470fb57edc17751536fe1ae98e6838
2021-04-19 09:15:01 -07:00
Treehugger Robot
cddf730f37 Merge "Add libneuralnetworks_shim.so to requireLibs." am: d7fd9b715c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675827

Change-Id: I74183f47c797788cf552737342a6c7fd04a8dda5
2021-04-19 16:01:03 +00:00
Treehugger Robot
d7fd9b715c Merge "Add libneuralnetworks_shim.so to requireLibs." 2021-04-19 15:40:11 +00:00
Hridya Valsaraju
129d8743b9 Prevent debugfs unmount on debug builds with a persist property
In order to simplify developer/test flow, the persistent property
persist.dbg.keep_debugfs_mounted can be set to prevent debugfs from
being unmounted on boot.

Bug: 184381659
Test: build and boot
Change-Id: I714616b361e6c8fb59633ec0763f9bd55af7df0e
2021-04-16 13:59:15 -07:00
David Anderson
dd7da900a0 Merge "ueventd: Allow pattern matching to find external firmware handler" am: 4a3ab034c6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664121

Change-Id: I842d88a14097d5ebf006b36eb57852c9520a5ff4
2021-04-16 20:56:37 +00:00
David Anderson
4a3ab034c6 Merge "ueventd: Allow pattern matching to find external firmware handler" 2021-04-16 20:35:58 +00:00
Christopher Ferris
6702256e0c Allow another prctl call.
A change was made so that pthread_create is calling
prctl(PR_PAC_RESET_KEYS, ...) on aarch64. It's possible that other
seccomp policies might need to change to allow this.

Test: CrasherTest.seccomp_backtrace passes on aarch64.
Change-Id: I9c4d1b3dca5f19a6285bf904bb942f1f52e42bd0
2021-04-16 13:35:16 -07:00
Suchang Woo
22fdd0ae13 ueventd: Allow pattern matching to find external firmware handler
Only the exact same devpath uevent can launch external handler specified
in ueventd.rc. So, you should specify all possible devpaths, even
firmware with different filenames on the same device. Pattern mactching
can be used to simplify this.

Test: atest CtsInitTestCases
Signed-off-by: Suchang Woo <suchang.woo@samsung.com>
Change-Id: If3b7a2cabb8055bf4b768d928f0fc0012da3c177
2021-04-16 13:35:10 -07:00
Treehugger Robot
4829792ec2 Merge "add missing spaces" am: 78e26beb02
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675560

Change-Id: I05d8fa24867a5da41251e9aef95423b3831742dc
2021-04-16 19:03:42 +00:00
Treehugger Robot
78e26beb02 Merge "add missing spaces" 2021-04-16 18:39:59 +00:00
Elliott Hughes
1fc404900c Merge "Remove move dead code." am: acec0918e5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1677028

Change-Id: I87daacd3eb5f510aa2beb461e277fd5984d8978f
2021-04-16 17:05:33 +00:00
Hridya Valsaraju
d723f21fec Rename ro.product.enforce_debugfs_restriction appropriately
Rename ro.product.enforce_debugfs_restrictions to
ro.product.debugfs_restrictions.enabled as per the sysprop naming
scheme.

Bug: 184381659
Test: build, boot
Change-Id: Ie350eefa342e7e16d31363139257ed285780e874
2021-04-16 09:52:03 -07:00
Elliott Hughes
acec0918e5 Merge "Remove move dead code." 2021-04-16 16:38:28 +00:00
Paul Crowley
e16255c8bc Merge changes from topic "revert-1665499-revert-1660531-max-boot-level-crypto-KFMCEDKSIV-WPIHELCRFI" am: 61abbef4e4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670267

Change-Id: I74a6e6739dff743cc88ff6e8609871b712b6322c
2021-04-16 16:13:13 +00:00
Paul Crowley
fe8e0de9a9 Revert^2 "Expose AID_KEYSTORE" am: 37a413d1c3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670266

Change-Id: I556b3a5e1ff238be74bbf3ca98cfa628e5bc7bb3
2021-04-16 16:13:05 +00:00
Paul Crowley
61abbef4e4 Merge changes from topic "revert-1665499-revert-1660531-max-boot-level-crypto-KFMCEDKSIV-WPIHELCRFI"
* changes:
  Revert^2 "Set earlyBootEnded before apex starts"
  Revert^2 "Expose AID_KEYSTORE"
2021-04-16 15:51:27 +00:00