From 18afae4adbead95233336a07d24bd94370b6b63d Mon Sep 17 00:00:00 2001
From: Ram Muthiah <rammuthiah@google.com>
Date: Fri, 10 Sep 2021 22:56:41 +0000
Subject: [PATCH] Revert "Revert "ANDROID: GKI: temporarily disable LTO/CFI""

This reverts commit c30036e2ecdf8181319c1bfbfabae683177bd9c5.

Reason for revert: Causes boot failure on kernel_virt_aarch64

Bug: 199547335
Test: revert and boot of aarch64 GKI on arm64 cf
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
Change-Id: I4fb34e19e85e661b28f40b2de53b063436838eab
---
 arch/arm64/configs/gki_defconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 4b2df0218c2f..89edc0590fa9 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -90,8 +90,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_SHADOW_CALL_STACK=y
-CONFIG_LTO_CLANG_FULL=y
-CONFIG_CFI_CLANG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y