diff options
| author | Martijn Coenen <maco@google.com> | 2020-06-18 10:34:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 10:34:01 +0000 |
| commit | 1d559120d07bedea4ab89df7973d1091d01faa65 (patch) | |
| tree | d93e60125b128fffacb1da1deddd863c2b04ef96 | |
| parent | 5144d5277266254fe97c4159c37db216c87d243a (diff) | |
| parent | 11bcd36aed8041c17d92402a9606b4330ef6aebc (diff) | |
| download | configs-1d559120d07bedea4ab89df7973d1091d01faa65.tar.gz | |
Merge "Revert "R+: Require _POSIX_ACL."" am: b5b3888633 am: 11bcd36aed
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1341996
Change-Id: I3b25b8ad1b53a66371ca306e5bba24d520d7b23f
| -rw-r--r-- | android-4.14/android-base-conditional.xml | 27 | ||||
| -rw-r--r-- | android-4.19/android-base-conditional.xml | 27 | ||||
| -rw-r--r-- | android-5.4/android-base-conditional.xml | 27 | ||||
| -rw-r--r-- | r/android-4.14/android-base-conditional.xml | 27 | ||||
| -rw-r--r-- | r/android-4.19/android-base-conditional.xml | 27 | ||||
| -rw-r--r-- | r/android-5.4/android-base-conditional.xml | 27 |
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 b38fde8..9e5d1de 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 5d5a477..d1d4b8a 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 a5e187f..d4265b5 100644 --- a/r/android-5.4/android-base-conditional.xml +++ b/r/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> |