Commit graph

67438 commits

Author SHA1 Message Date
Elliott Hughes
ebcf0925fc Merge "Use freecon() with getcon()/getfilecon()." am: 2acdc9de33
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1521162

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I023300186b76bba84632d278e454987688a9b325
2020-12-09 20:22:29 +00:00
Yifan Hong
696882455b Merge changes from topic "readonly_generic_ramdisk"
* changes:
  Add /metadata to ramdisk.
  Also create dirs under /first_stage_ramdisk for GKI.
  Refactor the list of empty dirs in ramdisk in its own list.
  Revert "Move e2fsck into /first_stage_ramdisk."
2020-12-09 19:46:17 +00:00
Treehugger Robot
8571b76185 Merge "Add erofs to supported fs type" 2020-12-09 19:16:40 +00:00
Elliott Hughes
2acdc9de33 Merge "Use freecon() with getcon()/getfilecon()." 2020-12-09 19:03:16 +00:00
Treehugger Robot
e495bce0af Merge "Add Android Studio Emulator team mebers to OWNERS" am: 25f322d353
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03ba9f0325f7e99d57a310c6f3c7b1820b52821e
2020-12-09 17:15:17 +00:00
Treehugger Robot
25f322d353 Merge "Add Android Studio Emulator team mebers to OWNERS" 2020-12-09 16:46:02 +00:00
Tom Cherry
a95f900d69 Merge "ueventd: add no_fnm_pathname option" am: 6cf3695502
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1518705

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bf82b3439e15e282bef89a9ecc40663796006f6
2020-12-09 16:06:38 +00:00
Tom Cherry
877e2374a7 Merge "ueventd: add the import option from the init parser" am: 0608e36fb9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1520220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia115083bd6f688a285368949ec8adbbdd322a816
2020-12-09 16:06:15 +00:00
Tom Cherry
6cf3695502 Merge "ueventd: add no_fnm_pathname option" 2020-12-09 15:50:16 +00:00
Tom Cherry
0608e36fb9 Merge "ueventd: add the import option from the init parser" 2020-12-09 15:47:25 +00:00
Elliott Hughes
d92c6a12da Use freecon() with getcon()/getfilecon().
Bug: https://issuetracker.google.com/175090444
Test: treehugger
Change-Id: Ia2b8102f1c9a4fd56ec1ff026ba5b4f375102b9b
2020-12-08 22:30:17 -08:00
Roman Kiryanov
d61738e8f1 Add Android Studio Emulator team mebers to OWNERS
qemu_pipe is an Android Studio Emulator (aka goldfish)
implementation detail.

Bug: 175046060
Test: none
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I7a80cdf1a2cd6b5af0d9544648b9d25e6abf9fad
2020-12-08 16:08:59 -08:00
Tom Cherry
5b271797de ueventd: add the import option from the init parser
Vendors have an interest in importing ueventd files based on certain
property values.  Instead of baking this logic in the ueventd binary,
add the import option from the init parser to the ueventd parser, to
allow vendors to expand as needed.

Test: imported files are parsed
Change-Id: I674987fd48f3218e4703528c6d905b1afb5fb366
2020-12-08 13:21:26 -08:00
Yifan Hong
a3f8373043 Add /metadata to ramdisk.
Now that GKI may not be writeable, also create /metadata at build time
to avoid error log at boot time.

Note that this also creates /first_stage_ramdisk/metadata in GKI.

[    1.891172] init: [libfs_mgr]check_fs():
mount(/dev/block/by-name/metadata,/metadata,ext4)=-1: No such
file or directory

Bug: 173425293
Test: boots

Change-Id: I62d23c382ed1ad165c1d6598b3df41bd92206733
2020-12-08 12:42:55 -08:00
Yifan Hong
55326187ab Also create dirs under /first_stage_ramdisk for GKI.
If the device uses GKI and generic ramdisk, also create
empty directories under /first_stage_ramdisk so that they
won't have to be created at runtime. This allows generic
ramdisk to be not writable.

Test: boots
Bug: 173425293
Change-Id: If987cb1d4af9f9ee94a43a4523f9e1465b01b16a
2020-12-08 12:42:55 -08:00
Yifan Hong
63be35649a Refactor the list of empty dirs in ramdisk in its own list.
Test: build and manual inspect
Bug: 173425293
Change-Id: I7805640af314b60801cc831f1d1f25820f0fb63b
2020-12-08 12:42:55 -08:00
Yifan Hong
addbafdb0b Revert "Move e2fsck into /first_stage_ramdisk."
This reverts commit 3337e782e6.

Reason for revert: e2fsck is moved into vendor ramdisk and installed
to / or /first_stage_ramdisk depending on the device, so there is no
need to move it.

Bug: 173425293
Change-Id: I1eb431e6b2a1e0ba7d0da0278d076b6682a0156d
Test: boots
2020-12-08 12:42:55 -08:00
Treehugger Robot
c6544c9246 Merge "ueventd: Add support for updating permissions on bind" am: bca7bfcc54
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1511048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35eb904d1129938662b7bbaa32e7c02a4addfb7e
2020-12-08 19:38:35 +00:00
Treehugger Robot
bca7bfcc54 Merge "ueventd: Add support for updating permissions on bind" 2020-12-08 18:53:44 +00:00
Tom Cherry
47031c8c88 ueventd: add no_fnm_pathname option
If a `*` appears within (but not at the end) of a /dev or /sys path in
a ueventd.rc file, then that path is matched with fnmatch() using the
FNM_PATHNAME, which means `*` will not match `/`.  That is not always
the intended behavior and this change creates the no_fnm_pathname
option, which will not use the FNM_PATHNAME flag and will have `*`
match `/`.

Bug: 172880724
Test: these unit tests
Change-Id: I85b813d89237dbf3af47564e5cbf6806df5d412f
2020-12-07 14:58:19 -08:00
Elliott Hughes
dcf81848cb Remove thread_store_set()/thread_store_get().
C++ thread_local is less code to write, and performs better. All known
users have been moved over already.

Test: treehugger
Change-Id: Idaa2a58bf23342dae08dd6b9003d8f532839b351
2020-12-07 10:54:53 -08:00
Treehugger Robot
f512b499b8 Merge "Make libcutils' thread local stuff more clearly deprecated." am: 77692aeea2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515640

Change-Id: I2eaec4711ffb72d9ab34bbe0c2c69eec8ad9a4cc
2020-12-07 18:12:31 +00:00
Treehugger Robot
77692aeea2 Merge "Make libcutils' thread local stuff more clearly deprecated." 2020-12-07 17:58:30 +00:00
Martijn Coenen
b7ab0c71a1 Merge "Split fsverity_init in two phases." am: cd91f86618
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513212

Change-Id: I6a5d18d3023de35754f33097b4e3373d06ffa3ef
2020-12-07 14:10:20 +00:00
Martijn Coenen
cd91f86618 Merge "Split fsverity_init in two phases." 2020-12-07 13:55:48 +00:00
Treehugger Robot
f92fe9ae13 Merge "Adding 'postinstall' root dir unconditionally." am: f38f0fdd2d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517503

Change-Id: If1f345217ea0fd7c105c7b0a8232c9a8055028f4
2020-12-05 01:55:39 +00:00
Treehugger Robot
f38f0fdd2d Merge "Adding 'postinstall' root dir unconditionally." 2020-12-05 01:15:47 +00:00
Huang Jianan
e1b25cd9ee Add erofs to supported fs type
Since erofs image has been supported, we should add erofs to supported
fs type so that it can be mounted in recovery mode.

Bug:174816929
Test: mount erofs image in recovery on cuttlefish
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Change-Id: I4199ff87acfc179a2b83d98b1675fc898144878b
2020-12-04 13:39:34 +00:00
Bowgo Tsai
2e228936f4 Adding 'postinstall' root dir unconditionally.
It is required to pass update_engine_unittests in GSI
compliance test. And it's clean to just add this mount
dir unconditionally.

Bug: 172696594
Test: `m init.environ.rc` and checks that $OUT/root/postinstall exists
Change-Id: Ib340a78af442ea66c45cecb373a9eb3c428f8dda
2020-12-04 17:07:26 +08:00
Treehugger Robot
da7bb0e81e Merge "Fix visibility rules for apex/statsd" am: 0a9aff2315
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1516918

Change-Id: I674a5fc3eb959bcc80d211be50da2577ccc4d627
2020-12-04 07:29:33 +00:00
Treehugger Robot
0a9aff2315 Merge "Fix visibility rules for apex/statsd" 2020-12-04 07:25:42 +00:00
Baligh Uddin
1b5888ee02 Fix visibility rules for apex/statsd
The //frameworks/base/apex/statsd path is being migrated to
//packages/modules/StatsD/apex.
BUG: 167962588
TEST: TH

Change-Id: Ifa64bd8268f1515597b11376cdf08828983e0c60
2020-12-04 06:07:38 +00:00
Jonglin Lee
5deedd42ef Merge "Revert "libprocessgroup: uid/pid hierarchy for cgroup v2"" am: ac216acad5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1516550

Change-Id: I518f8c2d4f9e6b62bd6797a8419bd90be0ee1773
2020-12-04 05:09:02 +00:00
Daniel Rosenberg
5be39f6b81 Merge changes Ia3aa8b3b,I6e8b80a8,I28552889 am: 2e67e77752
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1510244

Change-Id: I4f8df82e6d7419a43d666132199705056221d5dd
2020-12-04 05:08:43 +00:00
Jonglin Lee
ac216acad5 Merge "Revert "libprocessgroup: uid/pid hierarchy for cgroup v2"" 2020-12-04 04:47:39 +00:00
Daniel Rosenberg
2e67e77752 Merge changes Ia3aa8b3b,I6e8b80a8,I28552889
* changes:
  libsnapshot: Support cluster_ops in make_cow_from_ab_ota
  libsnapshot: Add silent option to inspect_cow
  libsnapshot: Group CowOperations into clusters
2020-12-04 03:47:57 +00:00
Treehugger Robot
9d879b847f Merge "Add product_available to product available modules" am: a9e6057dad
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1496003

Change-Id: I2643b1b482397a31971cc992e3ae450fb19d9797
2020-12-04 03:34:29 +00:00
Treehugger Robot
d79ac4b1c9 Merge "Revert "libsnapshot: Don't package snapuserd.rc in /vendor/etc."" am: 78edd704ab
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517277

Change-Id: I2690eabe51667f5b12531cea165bad1c30e831df
2020-12-04 03:18:06 +00:00
Jonglin Lee
4bbabe4ca4 Revert "libprocessgroup: uid/pid hierarchy for cgroup v2"
Revert "sepolicy: rules for uid/pid cgroups v2 hierarchy"

Revert submission 1511692-cgroup v2 uid/pid hierarchy

Reason for revert: Causing intermittent cgroup kernel panics
Reverted Changes:
I80c2a069b:sepolicy: rules for uid/pid cgroups v2 hierarchy
I73f3e767d:libprocessgroup: uid/pid hierarchy for cgroup v2

Bug: 174776875
Change-Id: I2af586d63bb0312407b90b52909330cde4b7b074
Test: Locally reverted and booted 100 times without kernel panic
2020-12-04 03:12:59 +00:00
Treehugger Robot
a9e6057dad Merge "Add product_available to product available modules" 2020-12-04 02:54:47 +00:00
Treehugger Robot
78edd704ab Merge "Revert "libsnapshot: Don't package snapuserd.rc in /vendor/etc."" 2020-12-04 02:08:06 +00:00
Kiyoung Kim
7184a231cd Merge "Use bootstrap linkerconfig from early init" am: 2f3e936f72
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1512740

Change-Id: I2c43dd431947c080d26957bec876902180868a23
2020-12-04 01:36:50 +00:00
Kiyoung Kim
2f3e936f72 Merge "Use bootstrap linkerconfig from early init" 2020-12-04 01:00:33 +00:00
Justin Yun
feef4d390f Add product_available to product available modules
vendor_available modules were available to product modules.
However, not all vendor_available modules are required to be
available to product modules. Some modules want to be available only
to product modules but not vendor modules.

To cover the requirement, we separate product_available from
vendor_available.
vendor_available will not provide product available module.

Rename libcutils/include_vndk to libcutils/include_outside_system as
it provides the headers to the modules outside the system partition
including /product.

Bug: 150902910
Test: build
Change-Id: I791b5a6a1dc99442065debfce6fa0f54a335fcea
2020-12-04 09:59:20 +09:00
Marco Ballesio
d62cc3a9f5 Merge "libprocessgroup: move freezer to uid/pid hierarchy" am: 382d70e770
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1515714

Change-Id: I5a93ce298175832b920e708fe7aa848a0c5fb79c
2020-12-03 23:32:10 +00:00
Suren Baghdasaryan
f3ea309045 Merge "libprocessgroup: Change per-API level task profiles to override the diffs" am: 42fcd76e6c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1516917

Change-Id: I3534552b33f76126342268af0fa2c5ee9a293c67
2020-12-03 23:31:27 +00:00
Marco Ballesio
382d70e770 Merge "libprocessgroup: move freezer to uid/pid hierarchy" 2020-12-03 22:52:19 +00:00
Suren Baghdasaryan
42fcd76e6c Merge "libprocessgroup: Change per-API level task profiles to override the diffs" 2020-12-03 22:50:57 +00:00
Yifan Hong
f76e65f286 Revert "libsnapshot: Don't package snapuserd.rc in /vendor/etc."
This reverts commit 68ba6695bd.

Bug: 174587489
Test: build and manual inspect

Reason for revert: revert workaround. Fix is in I71227d807244b.

Change-Id: I71b1c0f933eeba9dd8d8fbef3a682657f005cc3b
2020-12-03 22:29:41 +00:00
Marco Ballesio
1414a0d4d8 libprocessgroup: move freezer to uid/pid hierarchy
Migrate the freezer controller as an attribute for the uid/pid hierarchy

Bug: 168907513
Test: manually verified that the freezer behavior was as expected after
applying the enablers in ActivityManager

Signed-off-by: Marco Ballesio <balejs@google.com>
Change-Id: Ica2c4bfd20190fb2f2dc0a530eb47e1a8427c522
2020-12-03 22:00:33 +00:00