From 2a2cffe9e206805c708e31ce79a807a649b44594 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 14 Aug 2023 17:54:47 -0700 Subject: [PATCH] ANDROID: Use DTC from PATH. Instead of using a hard-coded path to DTC, infer its path from PATH. This change removes the dependency on the ${BUILDTOOLS_PREBUILT_BIN}/dtc symlink, so the build infrastructure is free to reset PATH to a place where the actual DTC binary exists. This change is needed to set --incompatible_disable_hermetic_tools_symlink_source to true by default. Test: bazel run //common:db845c_dist Fixes: a71e480e82a7 ("ANDROID: build.config: Set DTC to absolute path") Bug: 291816237 Change-Id: I75dac41802bd66a1b6c0c61d90b5b378b943b593 Signed-off-by: Yifan Hong --- build.config.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.config.common b/build.config.common index 23bc83967a7f..e2496b790bd8 100644 --- a/build.config.common +++ b/build.config.common @@ -4,7 +4,7 @@ LLVM=1 DEPMOD=depmod CLANG_PREBUILT_BIN=prebuilts/clang/host/linux-x86/clang-${CLANG_VERSION}/bin BUILDTOOLS_PREBUILT_BIN=build/kernel/build-tools/path/linux-x86 -DTC=${ROOT_DIR}/${BUILDTOOLS_PREBUILT_BIN}/dtc +DTC=$(command -v dtc) KCFLAGS="${KCFLAGS} -D__ANDROID_COMMON_KERNEL__" EXTRA_CMDS=''