From 14f39157c90b4eb5d9c1007b7095e7b55c58caaa Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 29 Mar 2022 13:42:11 -0700 Subject: [PATCH] ANDROID: build.config: set NDK_TRIPLE In order to support CONFIG_UAPI_HEADER_TEST=y with a bionic sysroot using prebuilt bionic from the NDK, we need to set a different target triple for USERCFLAGS than what's used when cross compiling the kernel (so that the correct headers and libc.{a|so} are found+used). Bug: 190019968 Signed-off-by: Nick Desaulniers Change-Id: Ib3e60c41b862cda9f79ff8d2c812aaa8bfb571af --- build.config.aarch64 | 2 ++ build.config.arm | 2 ++ build.config.x86_64 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/build.config.aarch64 b/build.config.aarch64 index 2bf2c158fcdb..9fcbceb10db2 100644 --- a/build.config.aarch64 +++ b/build.config.aarch64 @@ -12,3 +12,5 @@ vmlinux.symvers modules.builtin modules.builtin.modinfo " + +NDK_TRIPLE=aarch64-linux-android31 diff --git a/build.config.arm b/build.config.arm index 832c3c07173a..c7f114c66937 100644 --- a/build.config.arm +++ b/build.config.arm @@ -9,3 +9,5 @@ arch/arm/boot/zImage vmlinux System.map " + +NDK_TRIPLE=arm-linux-androideabi31 diff --git a/build.config.x86_64 b/build.config.x86_64 index 8b0633e68538..b5ac82b36bac 100644 --- a/build.config.x86_64 +++ b/build.config.x86_64 @@ -12,3 +12,5 @@ vmlinux.symvers modules.builtin modules.builtin.modinfo " + +NDK_TRIPLE=x86_64-linux-android31