diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2021-09-27 13:08:41 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2021-09-27 13:13:42 -0700 |
| commit | b698111b851c0ad2265a353dabe6c5a10f306b50 (patch) | |
| tree | 61870dbe69f209a87f66f9418aa6e00a24534114 | |
| parent | 6a8d155e48b637ca28f8e11d8793b5ccc5d7e890 (diff) | |
| download | configs-android11-tests-dev.tar.gz | |
5.4: Require CONFIG_CFI_CLANG only on supported architecturesandroid11-tests-dev
CONFIG_CFI_CLANG is supported on arm64 and x86_64 only.
Bug: 145297900
Test: Treehugger
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
[adelva: Adapted from aosp/1439217]
Change-Id: Iff990e009b9f3562158b8914dceae50c30359c97
Signed-off-by: Alistair Delva <adelva@google.com>
| -rw-r--r-- | r/android-5.4/android-base-conditional.xml | 18 | ||||
| -rw-r--r-- | r/android-5.4/android-base.config | 2 |
2 files changed, 18 insertions, 2 deletions
diff --git a/r/android-5.4/android-base-conditional.xml b/r/android-5.4/android-base-conditional.xml index 952611e..d54f670 100644 --- a/r/android-5.4/android-base-conditional.xml +++ b/r/android-5.4/android-base-conditional.xml @@ -52,6 +52,10 @@ <value type="bool">y</value> </config> <config> + <key>CONFIG_CFI_CLANG</key> + <value type="bool">y</value> + </config> + <config> <key>CONFIG_CP15_BARRIER_EMULATION</key> <value type="bool">y</value> </config> @@ -99,6 +103,20 @@ </config> </group> +<!-- x86_64 base requirements --> +<group> + <conditions> + <config> + <key>CONFIG_X86_64</key> + <value type="bool">y</value> + </config> + </conditions> + <config> + <key>CONFIG_CFI_CLANG</key> + <value type="bool">y</value> + </config> +</group> + <!-- CONFIG_ACPI || CONFIG_OF --> <group> <conditions> diff --git a/r/android-5.4/android-base.config b/r/android-5.4/android-base.config index 96f25f9..15c784c 100644 --- a/r/android-5.4/android-base.config +++ b/r/android-5.4/android-base.config @@ -28,7 +28,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLOCK=y CONFIG_BPF_JIT=y CONFIG_BPF_SYSCALL=y -CONFIG_CFI_CLANG=y CONFIG_CGROUPS=y CONFIG_CGROUP_BPF=y CONFIG_CGROUP_CPUACCT=y @@ -108,7 +107,6 @@ CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_JOYSTICK_XPAD=y CONFIG_L2TP=y -CONFIG_LTO_CLANG=y CONFIG_MAGIC_SYSRQ=y CONFIG_MD=y CONFIG_MEMBARRIER=y |