aboutsummaryrefslogtreecommitdiffstats
path: root/android-5.4
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2020-10-02 14:06:28 -0700
committerAlistair Delva <adelva@google.com>2020-10-02 14:08:27 -0700
commit1e3608038d8211e596f887a842ec0b34c16e0a61 (patch)
tree6c2c24ddd4d73805e3372aafc127373f725e777a /android-5.4
parent85abb2ba74d91c74e80e90128d9d7dffbf1b3907 (diff)
downloadkernel_configs-master.tar.gz
kernel_configs-master.tar.bz2
kernel_configs-master.zip
Don't enforce BPF_JIT_ALWAYS_ON on 32-bit x86HEADmaster
This feature is broken on 32-bit platforms and the networking team recommended removing it from compliance requirements on 32-bit. Do 5.4 only because we have no plans to test cuttlefish x86 32-bit on 4.19, so it would have no effect. Bug: 140377409 Change-Id: If2de2d706c2cfdc58b2bfa335a3bd33203488c95 Signed-off-by: Alistair Delva <adelva@google.com>
Diffstat (limited to 'android-5.4')
-rw-r--r--android-5.4/android-base-conditional.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/android-5.4/android-base-conditional.xml b/android-5.4/android-base-conditional.xml
index ba19046..8e8ee80 100644
--- a/android-5.4/android-base-conditional.xml
+++ b/android-5.4/android-base-conditional.xml
@@ -97,10 +97,6 @@
<key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
- <config>
- <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
- <value type="bool">y</value>
- </config>
</group>
<!-- x86_64 base requirements -->
@@ -115,6 +111,10 @@
<key>CONFIG_CFI_CLANG</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- CONFIG_ACPI || CONFIG_OF -->