From d04d01063d59d645790c770e4db46842e8c3e01a Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Thu, 1 Oct 2020 16:16:44 -0700 Subject: [PATCH] ANDROID: move builds to use gas prebuilts Completes stage 5 of: https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/BINUTILS_KERNEL_DEPRECATION.md Bug: 141693040 Test: remove host binutils (easy for cross compiling, hard for host tools), rebuild multiple configs including cuttlefish configs which rely on these. Signed-off-by: Nick Desaulniers Change-Id: Ia88f4f6572049c0173742aee95df824c0f31c050 --- build.config.aarch64 | 4 ++-- build.config.arm | 2 +- build.config.x86_64 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.config.aarch64 b/build.config.aarch64 index ce1709ac1812..61a227d5d512 100644 --- a/build.config.aarch64 +++ b/build.config.aarch64 @@ -3,8 +3,8 @@ ARCH=arm64 CLANG_TRIPLE=aarch64-linux-gnu- CROSS_COMPILE=aarch64-linux-androidkernel- CROSS_COMPILE_COMPAT=arm-linux-androidkernel- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin -LINUX_GCC_CROSS_COMPILE_COMPAT_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/ +LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 +LINUX_GCC_CROSS_COMPILE_COMPAT_PREBUILTS_BIN=prebuilts/gas/linux-x86 FILES=" arch/arm64/boot/Image.gz diff --git a/build.config.arm b/build.config.arm index 8eb547e21593..35defb811b98 100644 --- a/build.config.arm +++ b/build.config.arm @@ -2,7 +2,7 @@ ARCH=arm CLANG_TRIPLE=arm-linux-gnueabi- CROSS_COMPILE=arm-linux-androidkernel- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin +LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 FILES=" arch/arm/boot/Image.gz diff --git a/build.config.x86_64 b/build.config.x86_64 index df73a47e7220..73405452fe83 100644 --- a/build.config.x86_64 +++ b/build.config.x86_64 @@ -2,7 +2,7 @@ ARCH=x86_64 CLANG_TRIPLE=x86_64-linux-gnu- CROSS_COMPILE=x86_64-linux-androidkernel- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin +LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 FILES=" arch/x86/boot/bzImage