Attention needed from Aaron Wood, Clayton Wilkinson, David Fang, Jay Zhuang and Owners Override
David Turner has uploaded the change for review![Open in Gerrit]()
David Turner would like Clayton Wilkinson, David Fang, Owners Override, Aaron Wood and Jay Zhuang to review this change.
Commit message
Change-Id: Icac4649231548ec6fb5eb586ad66b07e7d8892fb
Change diff
diff --git a/scripts/bazel_tool.py b/build/bazel/scripts/bazel_tool.py
similarity index 99%
rename from scripts/bazel_tool.py
rename to build/bazel/scripts/bazel_tool.py
index 50939bb..bde3f9e 100755
--- a/scripts/bazel_tool.py
+++ b/build/bazel/scripts/bazel_tool.py
@@ -120,7 +120,7 @@
"""Implement the set_gn_targets command."""
# Lazy import of workspace_utils.py and gn_targets_utils.py
- sys.path.insert(0, f"{args.fuchsia_dir}/build/bazel/scripts")
+ sys.path.insert(0, str(Path(__file__).parent))
import gn_targets_utils
import workspace_utils
diff --git a/scripts/OWNERS b/scripts/OWNERS
index 2a8b214..f8c0926 100644
--- a/scripts/OWNERS
+++ b/scripts/OWNERS
@@ -5,8 +5,6 @@
# shell- and fx-related utilities.
per-file fuchsia-vendored-python*,fx,fx-*,hermetic-env = crj...@google.com
-per-file bazel_tool.py = file://build/OWNERS
-
# FIDL-related scripts.
per-file generate-fidl-* = file://tools/fidl/OWNERS
diff --git a/tools/devshell/bazel-tool b/tools/devshell/bazel-tool
index 59d3451..8bbdb74 100755
--- a/tools/devshell/bazel-tool
+++ b/tools/devshell/bazel-tool
@@ -13,17 +13,19 @@
## queries easily. Use --help for details.
##
+# shellcheck source=/dev/null
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"/lib/vars.sh || exit $?
fx-config-read
if [[ ! -d "${FUCHSIA_BUILD_DIR}" ]]; then
- fx-error "No Fuchsia build directory, please run `fx set` or `fx gen`."
+ fx-error "No Fuchsia build directory, please run 'fx set' or 'fx gen'."
fi
+# shellcheck source=/dev/null
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"/lib/bazel_utils.sh || exit $?
fx-update-bazel-workspace
-"${PREBUILT_PYTHON3}" "${FUCHSIA_DIR}"/scripts/bazel_tool.py \
+"${PREBUILT_PYTHON3}" "${FUCHSIA_DIR}"/build/bazel/scripts/bazel_tool.py \
--workspace="$(fx-get-bazel-workspace)" \
--fuchsia-dir="${FUCHSIA_DIR}" \
--build-dir="${FUCHSIA_BUILD_DIR}" \
Change information
Files:
- R build/bazel/scripts/bazel_tool.py
- M scripts/OWNERS
- M tools/devshell/bazel-tool
Change size: S
Delta: 3 files changed, 5 insertions(+), 5 deletions(-)
Open in GerritRelated details
Attention is currently required from:
- Aaron Wood
- Clayton Wilkinson
- David Fang
- Jay Zhuang
- Owners Override
Submit Requirements:
Code-Review
Review-Enforcement
Gerrit-MessageType: newchange
Gerrit-Project: fuchsia
Gerrit-Branch: main
Gerrit-Change-Id: Icac4649231548ec6fb5eb586ad66b07e7d8892fb
Gerrit-Change-Number: 1222966
Gerrit-PatchSet: 1
You received this message because you are subscribed to the Google Groups "owners-override" group.
To unsubscribe from this group and stop receiving emails from it, send an email to
.