From 3435c88b4a512423113b5a773a2b0ed911cbd841 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 1 Feb 2019 20:46:22 +0900 Subject: [PATCH] Configure /system/apex/com.android.runtime.[debug|release]/bin/* When TARGET_FLATTEN_APEX is set to true, the APEXes are flattened directly under /system/apex/. Among them the runtime APEX carries binaries such as linker, dex2oat and they need to be configured to be executable. Bug: 123684826 Test: Marlin/sailfish boots to the UI Change-Id: I8ebe9dc4341410ff91ca2cb7cf95e21b0829c008 --- libcutils/fs_config.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 59cbbc599..c95868dd9 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -88,6 +88,9 @@ 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" }, { 00751, AID_ROOT, AID_SHELL, 0, "vendor/bin" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor" }, { 00755, AID_ROOT, AID_ROOT, 0, 0 }, @@ -214,6 +217,9 @@ 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, "vendor/bin/*" }, { 00755, AID_ROOT, AID_SHELL, 0, "vendor/xbin/*" }, { 00644, AID_ROOT, AID_ROOT, 0, 0 },