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

Commit 21a62e2

Browse files
author
HONG Yifan
committed
ANDROID: Use DTC from PATH. (2nd attempt)
This is a re-apply of 2a2cffe ("ANDROID: Use DTC from PATH.") that adds DTC from PATH. Because checkpatch.sh and checkpatch_presubmit.sh no longer exists, and it is not allowed to source _setup_env.sh directly, this change can be re-applied. The warning message has been there for a year now, so it is okay to remove it so that, if dtc is not found in PATH, $DTC is left empty. Below is the original message. 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: a71e480 ("ANDROID: build.config: Set DTC to absolute path") Bug: 291816237 Change-Id: I4f6051dc079a33c8e5e2632aa7ed040049300601 Signed-off-by: HONG Yifan <[email protected]>
1 parent 5e9a8cb commit 21a62e2

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

build.config.common

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
BRANCH=android-mainline
44
LLVM=1
55
DEPMOD=depmod
6-
7-
# TODO(b/296265825): Turn this into a proper error
8-
DTC=$(command -v dtc || { echo "WARNING: $BUILD_CONFIG loaded without Kleaf hermetic tools.
9-
This will become an error in the future." >&2;
10-
echo "${ROOT_DIR}/${BUILDTOOLS_PREBUILT_BIN}/dtc";
11-
})
6+
DTC=$(command -v dtc)
127

138
KCFLAGS="${KCFLAGS} -D__ANDROID_COMMON_KERNEL__"
149
EXTRA_CMDS=''

0 commit comments

Comments
 (0)