diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-08 16:48:04 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-08 16:48:04 +0000 |
commit | 89e3c5996791dfc7e59b8b4411a6f8ea97498d30 (patch) | |
tree | 89da8b16cd034da57775f3ef0e16224419f0a92a | |
parent | 0d327fd3959bfd622139c623cdf42bd1485d554a (diff) | |
parent | 23fd15669e5afc1276c0c18f9ed856d7db7e48ec (diff) | |
download | configs-android12-mainline-networkstack-release.tar.gz |
Snap for 7806809 from 23fd15669e5afc1276c0c18f9ed856d7db7e48ec to mainline-networking-releaseandroid-mainline-12.0.0_r99android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r49android-mainline-12.0.0_r122android-mainline-12.0.0_r100android12-mainline-networkstack-release
Change-Id: I5f477b281a272a93617ffa9a4441c8b1b0741436
-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 |