aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2020-06-18 09:58:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-06-18 09:58:22 +0000
commitb5b3888633f0f7595849055e39ae16fb106dcb44 (patch)
treeea5d41f26d89a119313530952bd528e5956677c9
parentbe07849569bd88434162ba410060970ac04b53bf (diff)
parent8969dbb9e0bb1d91a467e38c564dc18e60cde753 (diff)
downloadconfigs-b5b3888633f0f7595849055e39ae16fb106dcb44.tar.gz
Merge "Revert "R+: Require _POSIX_ACL.""
-rw-r--r--android-4.14/android-base-conditional.xml27
-rw-r--r--android-4.19/android-base-conditional.xml27
-rw-r--r--android-5.4/android-base-conditional.xml27
-rw-r--r--r/android-4.14/android-base-conditional.xml27
-rw-r--r--r/android-4.19/android-base-conditional.xml27
-rw-r--r--r/android-5.4/android-base-conditional.xml27
6 files changed, 0 insertions, 162 deletions
diff --git a/android-4.14/android-base-conditional.xml b/android-4.14/android-base-conditional.xml
index 83c1634..3102224 100644
--- a/android-4.14/android-base-conditional.xml
+++ b/android-4.14/android-base-conditional.xml
@@ -135,30 +135,3 @@
</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 c945965..7ea3405 100644
--- a/android-4.19/android-base-conditional.xml
+++ b/android-4.19/android-base-conditional.xml
@@ -135,30 +135,3 @@
</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 dc9021a..72889f1 100644
--- a/android-5.4/android-base-conditional.xml
+++ b/android-5.4/android-base-conditional.xml
@@ -139,30 +139,3 @@
</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 83c1634..3102224 100644
--- a/r/android-4.14/android-base-conditional.xml
+++ b/r/android-4.14/android-base-conditional.xml
@@ -135,30 +135,3 @@
</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 c945965..7ea3405 100644
--- a/r/android-4.19/android-base-conditional.xml
+++ b/r/android-4.19/android-base-conditional.xml
@@ -135,30 +135,3 @@
</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 fc60730..29ef44f 100644
--- a/r/android-5.4/android-base-conditional.xml
+++ b/r/android-5.4/android-base-conditional.xml
@@ -135,30 +135,3 @@
</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>