android R: deprecate CONFIG_PM_WAKELOCKS
CONFIG_PM_AUTOSLEEP has long been deprecated. Remove it from
android-4.19.
CONFIG_PM_WAKELOCKS_LIMIT and CONFIG_PM_WAKELOCKS_GC depend on
CONFIG_PM_WAKELOCKS, so we can safely remove them from recommended
configs.
Bug: 115946999
Test: n/a
Change-Id: I0ac1b51feaedf9fd96f7be5374e4409b01bf1912
Signed-off-by: Tri Vo <trong@google.com>
diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config
index 30e2ade..46a2b23 100644
--- a/android-4.14/android-base.config
+++ b/android-4.14/android-base.config
@@ -5,6 +5,7 @@
# CONFIG_NFSD is not set
# CONFIG_NFS_FS is not set
# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
# CONFIG_SYSVIPC is not set
# CONFIG_USELIB is not set
CONFIG_ADVISE_SYSCALLS=y
@@ -174,7 +175,6 @@
CONFIG_NF_SOCKET_IPV6=y
CONFIG_NO_HZ=y
CONFIG_PACKET=y
-CONFIG_PM_WAKELOCKS=y
CONFIG_POSIX_TIMERS=y
CONFIG_PPP=y
CONFIG_PPPOL2TP=y
diff --git a/android-4.14/android-recommended.config b/android-4.14/android-recommended.config
index d291a8a..8e8a414 100644
--- a/android-4.14/android-recommended.config
+++ b/android-4.14/android-recommended.config
@@ -4,7 +4,6 @@
# CONFIG_KSM is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_PM_WAKELOCKS_GC is not set
# CONFIG_VT is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BLK_DEV_DM=y
@@ -111,7 +110,6 @@
CONFIG_PANTHERLORD_FF=y
CONFIG_PERF_EVENTS=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_WAKELOCKS_LIMIT=0
CONFIG_POWER_SUPPLY=y
CONFIG_PSI=y
CONFIG_PSTORE=y
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config
index 4b07f23..00f2903 100644
--- a/android-4.19/android-base.config
+++ b/android-4.19/android-base.config
@@ -3,6 +3,8 @@
# CONFIG_FHANDLE is not set
# CONFIG_NFSD is not set
# CONFIG_NFS_FS is not set
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
# CONFIG_SYSVIPC is not set
# CONFIG_USELIB is not set
CONFIG_ADVISE_SYSCALLS=y
@@ -169,7 +171,6 @@
CONFIG_NF_SOCKET_IPV6=y
CONFIG_NO_HZ=y
CONFIG_PACKET=y
-CONFIG_PM_WAKELOCKS=y
CONFIG_POSIX_TIMERS=y
CONFIG_PPP=y
CONFIG_PPPOL2TP=y
diff --git a/android-4.19/android-recommended.config b/android-4.19/android-recommended.config
index 0571483..5aafa0a 100644
--- a/android-4.19/android-recommended.config
+++ b/android-4.19/android-recommended.config
@@ -4,7 +4,6 @@
# CONFIG_KSM is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_PM_WAKELOCKS_GC is not set
# CONFIG_VT is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BLK_DEV_DM=y
@@ -109,7 +108,6 @@
CONFIG_PANTHERLORD_FF=y
CONFIG_PERF_EVENTS=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_WAKELOCKS_LIMIT=0
CONFIG_POWER_SUPPLY=y
CONFIG_PSI=y
CONFIG_PSTORE=y
diff --git a/android-4.9/android-base.config b/android-4.9/android-base.config
index e006a36..e047a99 100644
--- a/android-4.9/android-base.config
+++ b/android-4.9/android-base.config
@@ -6,6 +6,7 @@
# CONFIG_NFSD is not set
# CONFIG_NFS_FS is not set
# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
# CONFIG_SYSVIPC is not set
# CONFIG_USELIB is not set
CONFIG_ADVISE_SYSCALLS=y
@@ -173,7 +174,6 @@
CONFIG_NF_NAT=y
CONFIG_NO_HZ=y
CONFIG_PACKET=y
-CONFIG_PM_WAKELOCKS=y
CONFIG_PPP=y
CONFIG_PPPOL2TP=y
CONFIG_PPP_BSDCOMP=y
diff --git a/android-4.9/android-recommended.config b/android-4.9/android-recommended.config
index a133181..01a8d4d 100644
--- a/android-4.9/android-recommended.config
+++ b/android-4.9/android-recommended.config
@@ -4,7 +4,6 @@
# CONFIG_KSM is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_PM_WAKELOCKS_GC is not set
# CONFIG_VT is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BLK_DEV_DM=y
@@ -113,7 +112,6 @@
CONFIG_PANTHERLORD_FF=y
CONFIG_PERF_EVENTS=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_WAKELOCKS_LIMIT=0
CONFIG_POWER_SUPPLY=y
CONFIG_PSI=y
CONFIG_PSTORE=y
