summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-05-04 16:25:25 -0500
committerandroid-build-merger2017-05-04 16:25:25 -0500
commite9e599751bac4dfce0edbd9d4a948cf8e1b5374c (patch)
tree66389cf8da02a521c3a7771b1bfe1da63c33ad06 /libcutils/fs_config.cpp
parent2c8f8bd32c8a6ae7350f47377b397c7981d6a00b (diff)
parent4bc080ab1a23ac4815cdc3e84967c309239c0881 (diff)
downloadplatform-system-core-e9e599751bac4dfce0edbd9d4a948cf8e1b5374c.tar.gz
platform-system-core-e9e599751bac4dfce0edbd9d4a948cf8e1b5374c.tar.xz
platform-system-core-e9e599751bac4dfce0edbd9d4a948cf8e1b5374c.zip
Merge "libcutils: fs_config internal table alias test" am: 8fad110bfa am: bfead93a3a
am: 4bc080ab1a Change-Id: Iddf608a4082d9442f48355291abd15e2aef6a18d
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 55e393cc1..ea99595f4 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -92,6 +92,9 @@ static const struct fs_path_config android_dirs[] = {
92 { 00755, AID_ROOT, AID_ROOT, 0, 0 }, 92 { 00755, AID_ROOT, AID_ROOT, 0, 0 },
93 // clang-format on 93 // clang-format on
94}; 94};
95#ifndef __ANDROID_VNDK__
96auto __for_testing_only__android_dirs = android_dirs;
97#endif
95 98
96// Rules for files. 99// Rules for files.
97// These rules are applied based on "first match", so they 100// These rules are applied based on "first match", so they
@@ -238,6 +241,9 @@ static const struct fs_path_config android_files[] = {
238 { 00644, AID_ROOT, AID_ROOT, 0, 0 }, 241 { 00644, AID_ROOT, AID_ROOT, 0, 0 },
239 // clang-format on 242 // clang-format on
240}; 243};
244#ifndef __ANDROID_VNDK__
245auto __for_testing_only__android_files = android_files;
246#endif
241 247
242static size_t strip(const char* path, size_t len, const char suffix[]) { 248static size_t strip(const char* path, size_t len, const char suffix[]) {
243 if (len < strlen(suffix)) return len; 249 if (len < strlen(suffix)) return len;