Merge changes from topic "ramdisk"

am: d66e442c21

Change-Id: If16d9e37a50ff3de093f37c6200d29f9f22e3703
This commit is contained in:
Yifan Hong 2020-01-24 16:38:51 -08:00 committed by android-build-merger
commit 49e66cc894

View file

@ -196,6 +196,7 @@ static const struct fs_path_config android_files[] = {
{ 00750, AID_ROOT, AID_SHELL, CAP_MASK_LONG(CAP_SETUID) |
CAP_MASK_LONG(CAP_SETGID),
"system/bin/simpleperf_app_runner" },
{ 00755, AID_ROOT, AID_ROOT, 0, "first_stage_ramdisk/system/bin/e2fsck" },
// generic defaults
{ 00755, AID_ROOT, AID_ROOT, 0, "bin/*" },
{ 00640, AID_ROOT, AID_SHELL, 0, "fstab.*" },