Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 49fe412

Browse files
committed
ANDROID: Move CLANGTOOLS/RUST_PREBUILT_BIN to build.config.common.
from build.config.constants. They don't need to be exposed in @kernel_toolchain_info, hence they do not belong to build.config.constants. Test: TH Bug: 284390729 Change-Id: Ic38dd9b759f30f5d311d00fb77ac7cce78b26aef Signed-off-by: Yifan Hong <elsk@google.com>
1 parent 921dd38 commit 49fe412

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build.config.common

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
LLVM=1
44
DEPMOD=depmod
55
CLANG_PREBUILT_BIN=prebuilts/clang/host/linux-x86/clang-${CLANG_VERSION}/bin
6+
CLANGTOOLS_PREBUILT_BIN=prebuilts/clang-tools/linux-x86/bin
67
BUILDTOOLS_PREBUILT_BIN=build/kernel/build-tools/path/linux-x86
8+
RUST_PREBUILT_BIN=prebuilts/rust/linux-x86/${RUSTC_VERSION}/bin
79
DTC=${ROOT_DIR}/${BUILDTOOLS_PREBUILT_BIN}/dtc
810

911
KCFLAGS="${KCFLAGS} -D__ANDROID_COMMON_KERNEL__"

build.config.constants

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
BRANCH=android-mainline
22
CLANG_VERSION=r475365b
33
RUSTC_VERSION=1.68.0
4-
CLANGTOOLS_PREBUILT_BIN=prebuilts/clang-tools/linux-x86/bin
5-
RUST_PREBUILT_BIN=prebuilts/rust/linux-x86/${RUSTC_VERSION}/bin
64
AARCH64_NDK_TRIPLE=aarch64-linux-android31
75
X86_64_NDK_TRIPLE=x86_64-linux-android31

0 commit comments

Comments
 (0)