From 374ed837f28bea2d23f73b0314faf5d23007f811 Mon Sep 17 00:00:00 2001
From: Sandeep Patil <sspatil@google.com>
Date: Tue, 24 Mar 2020 21:35:25 -0700
Subject: [PATCH] ANDROID: GKI: re-enable LTO, CFI and SCS

The configuration options were accidentally disabled in
aosp/1261171

Bug: none
Test: builds

Signed-off-by: Sandeep Patil <sspatil@google.com>
Change-Id: I5ba11e8cde97dd484c55e10488610f6da3fe0a4b
---
 arch/arm64/configs/gki_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 190369180f16..696155fffbde 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -78,6 +78,9 @@ CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_JUMP_LABEL=y
+CONFIG_LTO_CLANG=y
+CONFIG_CFI_CLANG=y
+CONFIG_SHADOW_CALL_STACK=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y