From 0c830ba471cbbe42dc299ae8329581f8bf160860 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Thu, 13 Jan 2022 12:14:41 -0800
Subject: [PATCH] ANDROID: remove more stale variables from build.config files

CROSS_COMPILE is no longer necessary when building with LLVM=1 as of
upstream v5.15-rc1's
commit 231ad7f409f1 ("Makefile: infer --target from ARCH for CC=clang")
which was backported to android13-5.10.

LLVM_IAS=1 is implied by LLVM=1 as of LLVM_IAS as of
upstream v5.15-rc1's
commit f12b034afeb3 ("scripts/Makefile.clang: default to LLVM_IAS=1")
which was backported to android13-5.10.

Bug: 209655537
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: Id426f680bba8d478ed300dd0f6551dc419ea345f
---
 build.config.aarch64 | 2 --
 build.config.arm     | 2 --
 build.config.x86_64  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/build.config.aarch64 b/build.config.aarch64
index df8f76ab272c..e0a51433cd16 100644
--- a/build.config.aarch64
+++ b/build.config.aarch64
@@ -1,6 +1,4 @@
 ARCH=arm64
-LLVM_IAS=1
-CROSS_COMPILE=aarch64-linux-gnu-
 
 FILES="
 arch/arm64/boot/Image.gz
diff --git a/build.config.arm b/build.config.arm
index dce13076dfcb..cc802a1948bb 100644
--- a/build.config.arm
+++ b/build.config.arm
@@ -1,6 +1,4 @@
 ARCH=arm
-LLVM_IAS=1
-CROSS_COMPILE=arm-linux-gnueabi-
 
 FILES="
 arch/arm/boot/Image.gz
diff --git a/build.config.x86_64 b/build.config.x86_64
index cfbee0c5f881..c51c522c8445 100644
--- a/build.config.x86_64
+++ b/build.config.x86_64
@@ -1,6 +1,4 @@
 ARCH=x86_64
-LLVM_IAS=1
-CROSS_COMPILE=x86_64-linux-gnu-
 
 FILES="
 arch/x86/boot/bzImage