move CONFIG_RANDOMIZE_BASE to recommended
CONFIG_RANDOMIZE_BASE is not strictly required by Android.
Bug: 69368848
Test: run vts-kernel -m VtsKernelConfig
Change-Id: Ibc68339c453e10a7d0fec9aa29a694effa45904a
Signed-off-by: Steve Muckle <smuckle@google.com>
diff --git a/android-4.4/android-base-arm64.cfg b/android-4.4/android-base-arm64.cfg
index 757232b..43f23d6 100644
--- a/android-4.4/android-base-arm64.cfg
+++ b/android-4.4/android-base-arm64.cfg
@@ -1,6 +1,5 @@
# KEEP ALPHABETICALLY SORTED
CONFIG_ARMV8_DEPRECATED=y
CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_RANDOMIZE_BASE=y
CONFIG_SETEND_EMULATION=y
CONFIG_SWP_EMULATION=y
diff --git a/android-4.4/android-base-x86.cfg b/android-4.4/android-base-x86.cfg
deleted file mode 100644
index ab5b906..0000000
--- a/android-4.4/android-base-x86.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# KEEP ALPHABETICALLY SORTED
-CONFIG_RANDOMIZE_BASE=y
diff --git a/android-4.4/android-recommended.cfg b/android-4.4/android-recommended.cfg
index 74cc0ef..0a689c0 100644
--- a/android-4.4/android-recommended.cfg
+++ b/android-4.4/android-recommended.cfg
@@ -114,6 +114,7 @@
CONFIG_QUOTACTL=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_QUOTA_TREE=y
+CONFIG_RANDOMIZE_BASE=y
CONFIG_SCHEDSTATS=y
CONFIG_SDCARD_FS=y
CONFIG_SMARTJOYPLUS_FF=y
diff --git a/android-4.9/android-base-arm64.cfg b/android-4.9/android-base-arm64.cfg
index 757232b..43f23d6 100644
--- a/android-4.9/android-base-arm64.cfg
+++ b/android-4.9/android-base-arm64.cfg
@@ -1,6 +1,5 @@
# KEEP ALPHABETICALLY SORTED
CONFIG_ARMV8_DEPRECATED=y
CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_RANDOMIZE_BASE=y
CONFIG_SETEND_EMULATION=y
CONFIG_SWP_EMULATION=y
diff --git a/android-4.9/android-base-x86.cfg b/android-4.9/android-base-x86.cfg
deleted file mode 100644
index ab5b906..0000000
--- a/android-4.9/android-base-x86.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# KEEP ALPHABETICALLY SORTED
-CONFIG_RANDOMIZE_BASE=y
diff --git a/android-4.9/android-recommended.cfg b/android-4.9/android-recommended.cfg
index 84ccb12..0a32693 100644
--- a/android-4.9/android-recommended.cfg
+++ b/android-4.9/android-recommended.cfg
@@ -112,6 +112,7 @@
CONFIG_QUOTACTL=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_QUOTA_TREE=y
+CONFIG_RANDOMIZE_BASE=y
CONFIG_SCHEDSTATS=y
CONFIG_SDCARD_FS=y
CONFIG_SMARTJOYPLUS_FF=y
