aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2020-03-04 13:41:14 -0800
committerTheodore Ts'o <tytso@mit.edu>2020-10-01 17:36:44 -0400
commit694b1400f2a7402d8332285cdbad9a29b831adc5 (patch)
tree6ea14ee58235ebeadb7eda9caee7b182498c989e
parent1dd48bc23c3776df76459aff0c7723fff850ea45 (diff)
downloade2fsprogs-694b1400f2a7402d8332285cdbad9a29b831adc5.tar.gz
AOSP: Include private/fs_config.h directly when needed
This is no longer a transitive include of android_filesystem_config.h Bug: 149785767 Test: build Change-Id: I954adf7879fa811eb2b290a0983c84d47ecae26c From AOSP commit: 9fa6bed983d5ddd7226af647a0c4c0d922227be4
-rw-r--r--contrib/android/perms.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/android/perms.h b/contrib/android/perms.h
index 6d6a21299..798712720 100644
--- a/contrib/android/perms.h
+++ b/contrib/android/perms.h
@@ -51,6 +51,7 @@ static inline errcode_t android_configure_fs(ext2_filsys fs,
# endif
# include <private/android_filesystem_config.h>
# include <private/canned_fs_config.h>
+# include <private/fs_config.h>
errcode_t android_configure_fs(ext2_filsys fs, char *src_dir,
char *target_out,