From: Tom Cherry <tomcherry@google.com>
Date: Wed, 4 Mar 2020 21:41:14 +0000 (-0800)
Subject: AOSP: Include private/fs_config.h directly when needed
X-Git-Tag: v1.45.7~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=694b1400f2a7402d8332285cdbad9a29b831adc5;p=thirdparty%2Fe2fsprogs.git

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
---

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,