diff options
| author | Jiyong Park <jiyong@google.com> | 2019-02-09 02:58:12 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-02-09 02:59:17 +0900 |
| commit | defdb186756b0288cdea0f71025ebd1a9f3c66cf (patch) | |
| tree | be4612c4c6168c82d56779e6c69640cbd23c3408 | |
| parent | 2210f80e48839fc38d18155d4221d64f6f7d78e9 (diff) | |
| download | system_core-defdb186756b0288cdea0f71025ebd1a9f3c66cf.tar.gz system_core-defdb186756b0288cdea0f71025ebd1a9f3c66cf.tar.bz2 system_core-defdb186756b0288cdea0f71025ebd1a9f3c66cf.zip | |
Eliminate the APEX name in fs_config using wildcard
Bug: 123743953
Test: Marlin/sailfish boots to the UI
Change-Id: If1669122be78255879ffb8c8c0a7408a34b5e617
| -rw-r--r-- | libcutils/fs_config.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 618481361..f1dcd5002 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -95,9 +95,7 @@ static const struct fs_path_config android_dirs[] = { { 00755, AID_ROOT, AID_ROOT, 0, "system/etc/ppp" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/vendor" }, { 00751, AID_ROOT, AID_SHELL, 0, "system/xbin" }, - // TODO(b/123743953): eliminate the APEX name with better pattern matching - { 00755, AID_ROOT, AID_SHELL, 0, "system/apex/com.android.runtime.debug/bin" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/apex/com.android.runtime.release/bin" }, + { 00755, AID_ROOT, AID_SHELL, 0, "system/apex/*/bin" }, { 00751, AID_ROOT, AID_SHELL, 0, "vendor/bin" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor" }, { 00755, AID_ROOT, AID_ROOT, 0, 0 }, @@ -224,9 +222,7 @@ static const struct fs_path_config android_files[] = { { 00755, AID_ROOT, AID_ROOT, 0, "system/lib/valgrind/*" }, { 00755, AID_ROOT, AID_ROOT, 0, "system/lib64/valgrind/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "system/xbin/*" }, - // TODO(b/123743953): eliminate the APEX name with better pattern matching - { 00755, AID_ROOT, AID_SHELL, 0, "system/apex/com.android.runtime.debug/bin/*" }, - { 00755, AID_ROOT, AID_SHELL, 0, "system/apex/com.android.runtime.release/bin/*" }, + { 00755, AID_ROOT, AID_SHELL, 0, "system/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 }, |