clean up quota-related configs
CONFIG_QUOTA, CONFIG_QFMT_V2, and CONFIG_QUOTACTL have been required
since Android P. Move them to base from recommended.
CONFIG_QUOTA_TREE is selected by CONFIG_QFMT_V2, which is now required,
so it need not be expressed in recommended or base any longer.
The netlink interface for quota messages is not being used so
CONFIG_QUOTA_NETLINK_INTERFACE need not be recommended.
Bug: 112478037
Change-Id: I1e7da723c8a132fe5133fbbcbc0c4e8acc549f73
Signed-off-by: Steve Muckle <smuckle@google.com>
diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config
index 2f84c19..02f2ebc 100644
--- a/android-4.14/android-base.config
+++ b/android-4.14/android-base.config
@@ -171,6 +171,9 @@
CONFIG_PREEMPT=y
CONFIG_PROC_FS=y
CONFIG_PROFILING=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
CONFIG_RTC_CLASS=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_SCHED_DEBUG=y
diff --git a/android-4.14/android-recommended.config b/android-4.14/android-recommended.config
index c25873a..38327ce 100644
--- a/android-4.14/android-recommended.config
+++ b/android-4.14/android-recommended.config
@@ -112,11 +112,6 @@
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_RAM=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_QUOTA_TREE=y
CONFIG_REFCOUNT_FULL=y
CONFIG_SCHEDSTATS=y
CONFIG_SDCARD_FS=y
diff --git a/android-4.4/android-base.config b/android-4.4/android-base.config
index b07351c..f523246 100644
--- a/android-4.4/android-base.config
+++ b/android-4.4/android-base.config
@@ -168,6 +168,9 @@
CONFIG_PREEMPT=y
CONFIG_PROC_FS=y
CONFIG_PROFILING=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
CONFIG_RTC_CLASS=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_SCHED_DEBUG=y
diff --git a/android-4.4/android-recommended.config b/android-4.4/android-recommended.config
index bcd6ab7..7a6c3a5 100644
--- a/android-4.4/android-recommended.config
+++ b/android-4.4/android-recommended.config
@@ -114,11 +114,6 @@
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_RAM=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_QUOTA_TREE=y
CONFIG_SCHEDSTATS=y
CONFIG_SDCARD_FS=y
CONFIG_SMARTJOYPLUS_FF=y
diff --git a/android-4.9/android-base.config b/android-4.9/android-base.config
index 2b1be72..7300769 100644
--- a/android-4.9/android-base.config
+++ b/android-4.9/android-base.config
@@ -170,6 +170,9 @@
CONFIG_PREEMPT=y
CONFIG_PROC_FS=y
CONFIG_PROFILING=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
CONFIG_RTC_CLASS=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_SCHED_DEBUG=y
diff --git a/android-4.9/android-recommended.config b/android-4.9/android-recommended.config
index 8f196d6..72f94c8 100644
--- a/android-4.9/android-recommended.config
+++ b/android-4.9/android-recommended.config
@@ -114,11 +114,6 @@
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_RAM=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_QUOTA_TREE=y
CONFIG_SCHEDSTATS=y
CONFIG_SDCARD_FS=y
CONFIG_SMARTJOYPLUS_FF=y
