summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-05-04 16:19:54 -0500
committerandroid-build-merger2017-05-04 16:19:54 -0500
commit4bc080ab1a23ac4815cdc3e84967c309239c0881 (patch)
treec50a1a68cca660d7fdaa225a7d371c7c4b10c5f1 /libcutils/fs_config.cpp
parent8ee90c439a3fd0979b577b8f3b8daa256a4422b3 (diff)
parentbfead93a3a57c05054d819a17fda3730f7c2688e (diff)
downloadplatform-system-core-4bc080ab1a23ac4815cdc3e84967c309239c0881.tar.gz
platform-system-core-4bc080ab1a23ac4815cdc3e84967c309239c0881.tar.xz
platform-system-core-4bc080ab1a23ac4815cdc3e84967c309239c0881.zip
Merge "libcutils: fs_config internal table alias test" am: 8fad110bfa
am: bfead93a3a Change-Id: I6d3727fd22ce04559e437570d2a7b7a0ae35486a
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 a2dd67776..2b3443f3f 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;