From edce52103b656455435a54c05ffa66e37e58f8ac Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 7 Dec 2021 12:28:04 -0800 Subject: [PATCH] ANDROID: remove stale variables from build.config files LLVM_IAS=1 is implied by LLVM=1 as of LLVM_IAS as of v5.15-rc1 via commit f12b034afeb3 ("scripts/Makefile.clang: default to LLVM_IAS=1"). CROSS_COMPILE is no longer necessary when building with LLVM=1 as of v5.15-rc1 via: commit 231ad7f409f1 ("Makefile: infer --target from ARCH for CC=clang") There is no need for CROSS_COMPILE_COMPAT as of v5.16-rc1 via commit 3e6f8d1fa184 ("arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd") when LLVM=1 is set. LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN was a temporary dependency until LLVM_IAS=1 was enabled for all architectures. With LLVM_IAS=1 (implied by LLVM=1), nothing in this directory is used and the variable can be removed. It doesn't hurt to respecify any of the above, but they are no longer necessary. Bug: 209655537 Signed-off-by: Nick Desaulniers Change-Id: I361b05ea9f36da933e6712150650f476b093d0a7 --- build.config.aarch64 | 6 ------ build.config.arm | 5 ----- build.config.x86_64 | 5 ----- 3 files changed, 16 deletions(-) diff --git a/build.config.aarch64 b/build.config.aarch64 index 0346722447a5..2bf2c158fcdb 100644 --- a/build.config.aarch64 +++ b/build.config.aarch64 @@ -1,10 +1,4 @@ ARCH=arm64 - -LLVM_IAS=1 -CROSS_COMPILE=aarch64-linux-gnu- -CROSS_COMPILE_COMPAT=arm-linux-gnueabi- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 - MAKE_GOALS=" Image modules diff --git a/build.config.arm b/build.config.arm index d944676a87e0..832c3c07173a 100644 --- a/build.config.arm +++ b/build.config.arm @@ -1,9 +1,4 @@ ARCH=arm - -LLVM_IAS=1 -CROSS_COMPILE=arm-linux-gnueabi- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 - MAKE_GOALS=" zImage modules diff --git a/build.config.x86_64 b/build.config.x86_64 index ad246c9ff89e..8b0633e68538 100644 --- a/build.config.x86_64 +++ b/build.config.x86_64 @@ -1,9 +1,4 @@ ARCH=x86_64 - -LLVM_IAS=1 -CROSS_COMPILE=x86_64-linux-gnu- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 - MAKE_GOALS=" bzImage modules