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 <smuckle@google.com>
This commit is contained in:
parent
faa8aca29e
commit
fb1cfddf81
6 changed files with 6 additions and 2 deletions
|
@ -1,5 +1,6 @@
|
||||||
# KEEP ALPHABETICALLY SORTED
|
# KEEP ALPHABETICALLY SORTED
|
||||||
CONFIG_ARMV8_DEPRECATED=y
|
CONFIG_ARMV8_DEPRECATED=y
|
||||||
CONFIG_CP15_BARRIER_EMULATION=y
|
CONFIG_CP15_BARRIER_EMULATION=y
|
||||||
|
CONFIG_RANDOMIZE_BASE=y
|
||||||
CONFIG_SETEND_EMULATION=y
|
CONFIG_SETEND_EMULATION=y
|
||||||
CONFIG_SWP_EMULATION=y
|
CONFIG_SWP_EMULATION=y
|
||||||
|
|
2
android-4.4/android-base-x86.cfg
Normal file
2
android-4.4/android-base-x86.cfg
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
# KEEP ALPHABETICALLY SORTED
|
||||||
|
CONFIG_RANDOMIZE_BASE=y
|
|
@ -138,7 +138,6 @@ CONFIG_PPP_DEFLATE=y
|
||||||
CONFIG_PPP_MPPE=y
|
CONFIG_PPP_MPPE=y
|
||||||
CONFIG_PREEMPT=y
|
CONFIG_PREEMPT=y
|
||||||
CONFIG_PROFILING=y
|
CONFIG_PROFILING=y
|
||||||
CONFIG_RANDOMIZE_BASE=y
|
|
||||||
CONFIG_RTC_CLASS=y
|
CONFIG_RTC_CLASS=y
|
||||||
CONFIG_RT_GROUP_SCHED=y
|
CONFIG_RT_GROUP_SCHED=y
|
||||||
CONFIG_SECCOMP=y
|
CONFIG_SECCOMP=y
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
# KEEP ALPHABETICALLY SORTED
|
# KEEP ALPHABETICALLY SORTED
|
||||||
CONFIG_ARMV8_DEPRECATED=y
|
CONFIG_ARMV8_DEPRECATED=y
|
||||||
CONFIG_CP15_BARRIER_EMULATION=y
|
CONFIG_CP15_BARRIER_EMULATION=y
|
||||||
|
CONFIG_RANDOMIZE_BASE=y
|
||||||
CONFIG_SETEND_EMULATION=y
|
CONFIG_SETEND_EMULATION=y
|
||||||
CONFIG_SWP_EMULATION=y
|
CONFIG_SWP_EMULATION=y
|
||||||
|
|
2
android-4.9/android-base-x86.cfg
Normal file
2
android-4.9/android-base-x86.cfg
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
# KEEP ALPHABETICALLY SORTED
|
||||||
|
CONFIG_RANDOMIZE_BASE=y
|
|
@ -141,7 +141,6 @@ CONFIG_PPP_DEFLATE=y
|
||||||
CONFIG_PPP_MPPE=y
|
CONFIG_PPP_MPPE=y
|
||||||
CONFIG_PREEMPT=y
|
CONFIG_PREEMPT=y
|
||||||
CONFIG_PROFILING=y
|
CONFIG_PROFILING=y
|
||||||
CONFIG_RANDOMIZE_BASE=y
|
|
||||||
CONFIG_RTC_CLASS=y
|
CONFIG_RTC_CLASS=y
|
||||||
CONFIG_RT_GROUP_SCHED=y
|
CONFIG_RT_GROUP_SCHED=y
|
||||||
CONFIG_SECCOMP=y
|
CONFIG_SECCOMP=y
|
||||||
|
|
Loading…
Reference in a new issue