From ee064d54e1d64609c16114ddf5e1f989be441aa0 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Thu, 1 Oct 2020 17:09:28 -0700 Subject: [PATCH] ANDROID: use arm-linux-androidkernel- for CROSS_COMPILE_COMPAT While ultimately resulting in the same binary being used, this allows the arm64 compat vdso to use the same target triple as an ARCH=arm build for Android. This means that arm-linux-androideabi-elfedit doesn't need to be created in: https://android.googlesource.com/platform/prebuilts/gas/linux-x86/. Bug: 141693040 Test: BUILD_CONFIG=common/build.config.gki.aarch64 ./build/build.sh Signed-off-by: Nick Desaulniers Change-Id: Iecebbfe2588615399c73255fd89d0c5ce42db9c0 --- build.config.aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.config.aarch64 b/build.config.aarch64 index 913368b2f7f3..cbc0e8638e0f 100644 --- a/build.config.aarch64 +++ b/build.config.aarch64 @@ -2,7 +2,7 @@ ARCH=arm64 CLANG_TRIPLE=aarch64-linux-gnu- CROSS_COMPILE=aarch64-linux-androidkernel- -CROSS_COMPILE_COMPAT=arm-linux-androideabi- +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_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/