Revert "Revert "R+: Require _POSIX_ACL.""
This reverts commit 8969dbb9e0bb1d91a467e38c564dc18e60cde753.
Reason for revert: internal TH failure now fixed.
Change-Id: I8a73ed9c98ecb558130875fccb64280b6cebf9f3
diff --git a/android-4.14/android-base-conditional.xml b/android-4.14/android-base-conditional.xml
index ada11e7..400dc24 100644
--- a/android-4.14/android-base-conditional.xml
+++ b/android-4.14/android-base-conditional.xml
@@ -127,3 +127,30 @@
</config>
</group>
+<!-- EXT4 requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_EXT4_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_EXT4_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
+<!-- F2FS requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_F2FS_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_F2FS_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
diff --git a/android-4.19/android-base-conditional.xml b/android-4.19/android-base-conditional.xml
index 3bc4d5c..5a26b34 100644
--- a/android-4.19/android-base-conditional.xml
+++ b/android-4.19/android-base-conditional.xml
@@ -127,3 +127,30 @@
</config>
</group>
+<!-- EXT4 requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_EXT4_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_EXT4_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
+<!-- F2FS requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_F2FS_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_F2FS_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
diff --git a/android-5.4/android-base-conditional.xml b/android-5.4/android-base-conditional.xml
index ad79744..65e4298 100644
--- a/android-5.4/android-base-conditional.xml
+++ b/android-5.4/android-base-conditional.xml
@@ -131,3 +131,30 @@
</config>
</group>
+<!-- EXT4 requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_EXT4_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_EXT4_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
+<!-- F2FS requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_F2FS_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_F2FS_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
diff --git a/r/android-4.14/android-base-conditional.xml b/r/android-4.14/android-base-conditional.xml
index ada11e7..400dc24 100644
--- a/r/android-4.14/android-base-conditional.xml
+++ b/r/android-4.14/android-base-conditional.xml
@@ -127,3 +127,30 @@
</config>
</group>
+<!-- EXT4 requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_EXT4_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_EXT4_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
+<!-- F2FS requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_F2FS_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_F2FS_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
diff --git a/r/android-4.19/android-base-conditional.xml b/r/android-4.19/android-base-conditional.xml
index 3bc4d5c..5a26b34 100644
--- a/r/android-4.19/android-base-conditional.xml
+++ b/r/android-4.19/android-base-conditional.xml
@@ -127,3 +127,30 @@
</config>
</group>
+<!-- EXT4 requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_EXT4_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_EXT4_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
+<!-- F2FS requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_F2FS_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_F2FS_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
diff --git a/r/android-5.4/android-base-conditional.xml b/r/android-5.4/android-base-conditional.xml
index b10ad3b..46773ed 100644
--- a/r/android-5.4/android-base-conditional.xml
+++ b/r/android-5.4/android-base-conditional.xml
@@ -127,3 +127,30 @@
</config>
</group>
+<!-- EXT4 requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_EXT4_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_EXT4_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
+
+<!-- F2FS requirements -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_F2FS_FS</key>
+ <value type="bool">y</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_F2FS_FS_POSIX_ACL</key>
+ <value type="bool">y</value>
+ </config>
+</group>
