From 64ac4d81560a56ee701f3be2e47e004558d4ed75 Mon Sep 17 00:00:00 2001
From: Todd Kjos <tkjos@google.com>
Date: Thu, 25 Mar 2021 15:01:58 -0700
Subject: [PATCH] Revert "ANDROID: GKI: temporarily disable LTO/CFI"

This reverts commit 0eecc2aa30af62d9edc81aeaf52952cf5dc434c1.

Change-Id: I26cca7f19f9e904f47da48cddda4e7ef5aeb03f1
Signed-off-by: Todd Kjos <tkjos@google.com>
---
 arch/arm64/configs/gki_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 50ecb486f0f1..255e0d29f281 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -86,6 +86,8 @@ 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