From 01edc0939fc1fa8f079dedd3385a8bcf144e5f8a Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 23 May 2024 14:26:14 -0700 Subject: [PATCH] Remove fs_config lines for /data/*test*. These lines were originally added to avoid needing to manually chmod +x files pushed to these directories on the device, but adb push now automatically copies the x bit from the host for paths without an fs_config, so they should no longer be necessary. Bug: 341415989 Change-Id: I83007dfe05de7b86c26373460af1f199a6d21147 --- libcutils/fs_config.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 5efe2098b..c34cd711e 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -68,10 +68,6 @@ static const struct fs_path_config android_dirs[] = { { 01771, AID_SYSTEM, AID_MISC, 0, "data/misc" }, { 00775, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media/Music" }, { 00775, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/benchmarktest" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/benchmarktest64" }, { 00775, AID_ROOT, AID_ROOT, 0, "data/preloads" }, { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" }, { 00755, AID_ROOT, AID_SYSTEM, 0, "mnt" }, @@ -143,12 +139,6 @@ static const struct fs_path_config android_files[] = { { 00644, AID_SYSTEM, AID_SYSTEM, 0, "data/app-private/*" }, { 00644, AID_APP, AID_APP, 0, "data/data/*" }, { 00644, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media/*" }, - { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest/tests.txt" }, - { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/benchmarktest/*" }, - { 00750, AID_ROOT, AID_SHELL, 0, "data/benchmarktest64/*" }, { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" }, { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, // legacy; only for P release