From 583c2675f1fae2c3227268dc7fcaca5b0d1483ef Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 14 Feb 2023 13:51:59 -0800 Subject: [PATCH] ANDROID: Move NDK_TRIPLE to build.config.constants. ... so that they can be loaded by Kleaf extensions and read during the loading phase. Moving forward, we should remove build configs in the future and express constants in .bzl files. However, for now, until kernel_build has been migrated to use the defined cc_toolchain, we must keep this file. Test: Treehugger Bug: 228238975 Change-Id: Id9628663785970c460470382e1ae162e1112203d Signed-off-by: Yifan Hong --- build.config.aarch64 | 2 +- build.config.constants | 4 +++- build.config.x86_64 | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.config.aarch64 b/build.config.aarch64 index 9fcbceb10db2..ac192501dd54 100644 --- a/build.config.aarch64 +++ b/build.config.aarch64 @@ -13,4 +13,4 @@ modules.builtin modules.builtin.modinfo " -NDK_TRIPLE=aarch64-linux-android31 +NDK_TRIPLE=${AARCH64_NDK_TRIPLE} diff --git a/build.config.constants b/build.config.constants index c763f040d290..ed6569498060 100644 --- a/build.config.constants +++ b/build.config.constants @@ -1,2 +1,4 @@ BRANCH=android14-5.15 -CLANG_VERSION=r475365b \ No newline at end of file +CLANG_VERSION=r475365b +AARCH64_NDK_TRIPLE=aarch64-linux-android31 +X86_64_NDK_TRIPLE=x86_64-linux-android31 \ No newline at end of file diff --git a/build.config.x86_64 b/build.config.x86_64 index b5ac82b36bac..5577460ac788 100644 --- a/build.config.x86_64 +++ b/build.config.x86_64 @@ -13,4 +13,4 @@ modules.builtin modules.builtin.modinfo " -NDK_TRIPLE=x86_64-linux-android31 +NDK_TRIPLE=${X86_64_NDK_TRIPLE}