From fb1cfddf8109a712358bfcc9096206c37e6cd39a Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Fri, 10 Nov 2017 12:04:50 -0800 Subject: [PATCH] move CONFIG_RANDOMIZE_BASE out of global base config CONFIG_RANDOMIZE_BASE is not available for CONFIG_ARM platforms. Move it to the base config for arm64 and x86 instead. Bug: 69167010 Test: run vts-kernel -m VtsKernelConfig Change-Id: Ia130666e0fb886b01754424658579ab7623ed09f Signed-off-by: Steve Muckle --- android-4.4/android-base-arm64.cfg | 1 + android-4.4/android-base-x86.cfg | 2 ++ android-4.4/android-base.cfg | 1 - android-4.9/android-base-arm64.cfg | 1 + android-4.9/android-base-x86.cfg | 2 ++ android-4.9/android-base.cfg | 1 - 6 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 android-4.4/android-base-x86.cfg create mode 100644 android-4.9/android-base-x86.cfg diff --git a/android-4.4/android-base-arm64.cfg b/android-4.4/android-base-arm64.cfg index 43f23d6..757232b 100644 --- a/android-4.4/android-base-arm64.cfg +++ b/android-4.4/android-base-arm64.cfg @@ -1,5 +1,6 @@ # 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 new file mode 100644 index 0000000..ab5b906 --- /dev/null +++ b/android-4.4/android-base-x86.cfg @@ -0,0 +1,2 @@ +# KEEP ALPHABETICALLY SORTED +CONFIG_RANDOMIZE_BASE=y diff --git a/android-4.4/android-base.cfg b/android-4.4/android-base.cfg index 149c3c5..06cda33 100644 --- a/android-4.4/android-base.cfg +++ b/android-4.4/android-base.cfg @@ -138,7 +138,6 @@ CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y CONFIG_PREEMPT=y CONFIG_PROFILING=y -CONFIG_RANDOMIZE_BASE=y CONFIG_RTC_CLASS=y CONFIG_RT_GROUP_SCHED=y CONFIG_SECCOMP=y diff --git a/android-4.9/android-base-arm64.cfg b/android-4.9/android-base-arm64.cfg index 43f23d6..757232b 100644 --- a/android-4.9/android-base-arm64.cfg +++ b/android-4.9/android-base-arm64.cfg @@ -1,5 +1,6 @@ # 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 new file mode 100644 index 0000000..ab5b906 --- /dev/null +++ b/android-4.9/android-base-x86.cfg @@ -0,0 +1,2 @@ +# KEEP ALPHABETICALLY SORTED +CONFIG_RANDOMIZE_BASE=y diff --git a/android-4.9/android-base.cfg b/android-4.9/android-base.cfg index e078ae5..de89892 100644 --- a/android-4.9/android-base.cfg +++ b/android-4.9/android-base.cfg @@ -141,7 +141,6 @@ CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y CONFIG_PREEMPT=y CONFIG_PROFILING=y -CONFIG_RANDOMIZE_BASE=y CONFIG_RTC_CLASS=y CONFIG_RT_GROUP_SCHED=y CONFIG_SECCOMP=y