diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2024-02-16 00:38:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 00:38:57 +0000 |
| commit | fefe36908553ac0904b6672aa0eefd0b85c5f69a (patch) | |
| tree | b8e2e83067373c90258bba54cdba4c37a7198593 | |
| parent | 2221347247d49327323ce3836eaee6545067c720 (diff) | |
| parent | 68f866702930ff50a223edba75aea3cf17dbdd22 (diff) | |
| download | configs-fefe36908553ac0904b6672aa0eefd0b85c5f69a.tar.gz | |
v: 6.x: Update to match VSR 3.4.6 kernel security requirements am: 68f8667029
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2930436
Change-Id: I7c4f59defdacf6b2c8dc53bc4c87a4232fd5548a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | v/android-6.1/android-base-conditional.xml | 8 | ||||
| -rw-r--r-- | v/android-6.6/android-base-conditional.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/v/android-6.1/android-base-conditional.xml b/v/android-6.1/android-base-conditional.xml index a85563a..ec0c9f8 100644 --- a/v/android-6.1/android-base-conditional.xml +++ b/v/android-6.1/android-base-conditional.xml @@ -47,10 +47,10 @@ <key>CONFIG_ARMV8_DEPRECATED</key> <value type="bool">y</value> </config> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_COMPAT</key> <value type="bool">y</value> @@ -147,10 +147,10 @@ <value type="bool">y</value> </config> </conditions> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_BPF_JIT_ALWAYS_ON</key> <value type="bool">y</value> diff --git a/v/android-6.6/android-base-conditional.xml b/v/android-6.6/android-base-conditional.xml index d049e81..cb7cd51 100644 --- a/v/android-6.6/android-base-conditional.xml +++ b/v/android-6.6/android-base-conditional.xml @@ -47,10 +47,10 @@ <key>CONFIG_ARMV8_DEPRECATED</key> <value type="bool">y</value> </config> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_COMPAT</key> <value type="bool">y</value> @@ -147,10 +147,10 @@ <value type="bool">y</value> </config> </conditions> - <!--<config> + <config> <key>CONFIG_CFI_CLANG</key> <value type="bool">y</value> - </config>--> + </config> <config> <key>CONFIG_BPF_JIT_ALWAYS_ON</key> <value type="bool">y</value> |