From 08792eb5de3025186946a4933d038913ea58ab32 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 20 Dec 2019 03:54:57 +0900 Subject: [PATCH] Add system_ext/apex/*/bin to fs_config Flattened APEXes can be installed in /system_ext. Especially, GSI have both flattened/unflattened apexes so that it can run with updatable devices and non-updatable devices as well. Bug: 145963716 Test: flash GSI on P device and boot Change-Id: I3a941672446a5353517243a851739a66f4252617 --- libcutils/fs_config.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 2b39ca6f5..dc31b2830 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -86,6 +86,7 @@ static const struct fs_path_config android_dirs[] = { { 00751, AID_ROOT, AID_SHELL, 0, "system/xbin" }, { 00751, AID_ROOT, AID_SHELL, 0, "system/apex/*/bin" }, { 00751, AID_ROOT, AID_SHELL, 0, "system_ext/bin" }, + { 00751, AID_ROOT, AID_SHELL, 0, "system_ext/apex/*/bin" }, { 00751, AID_ROOT, AID_SHELL, 0, "vendor/bin" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor" }, { 00755, AID_ROOT, AID_ROOT, 0, 0 }, @@ -209,6 +210,7 @@ static const struct fs_path_config android_files[] = { { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/apex/*/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system_ext/bin/*" }, + { 00755, AID_ROOT, AID_SHELL, 0, "system_ext/apex/*/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor/xbin/*" }, { 00644, AID_ROOT, AID_ROOT, 0, 0 },