diff options
| author | Liz Kammer <eakammer@google.com> | 2023-01-25 14:26:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-25 14:26:19 +0000 |
| commit | 331651016fe5f0f4d75f53fcb7d736ab4518c494 (patch) | |
| tree | cc3ebafca305f3cc6e72058c8ab00f113e4d2835 /ci | |
| parent | d2ad64fef2884c1c30b18fe6cbe019d0e56e99d9 (diff) | |
| parent | 6a156d63785b1d4cec266f8035e44b930e7ef46c (diff) | |
| download | bazel-331651016fe5f0f4d75f53fcb7d736ab4518c494.tar.gz | |
Merge changes from topic "rename-bp2build_progress"
* changes:
Add option to see transitive graph after converted
Add test for bp2build_progress
Rename bp2build-progress -> bp2build_progress
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/bp2build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ci/bp2build.sh b/ci/bp2build.sh index 93644f3d..820ef121 100755 --- a/ci/bp2build.sh +++ b/ci/bp2build.sh @@ -80,7 +80,7 @@ build/bazel/bin/bazel --max_idle_secs=5 test ${FLAGS} --build_tests_only=false - -- ${BUILD_TARGETS} ${TEST_TARGETS} "${HOST_INCOMPATIBLE_TARGETS[@]}" ################### -# bp2build-progress +# bp2build progress ################### function get_soong_names_from_queryview() { @@ -113,7 +113,7 @@ APEX_VNDK_QUERY="kind(\"apex_vndk rule\", //...)" BP2BUILD_PROGRESS_MODULES+=( $(get_soong_names_from_queryview "${APEX_QUERY}"" + ""${APEX_VNDK_QUERY}" ) ) -bp2build_progress_script="//build/bazel/scripts/bp2build-progress:bp2build-progress" +bp2build_progress_script="//build/bazel/scripts/bp2build_progress:bp2build_progress" bp2build_progress_output_dir="${DIST_DIR}/bp2build-progress" mkdir -p "${bp2build_progress_output_dir}" @@ -121,11 +121,11 @@ report_args="" for m in "${BP2BUILD_PROGRESS_MODULES[@]}"; do report_args="$report_args -m ""${m}" if [[ "${m}" =~ (media.swcodec|neuralnetworks)$ ]]; then - build/bazel/bin/bazel run ${FLAGS} --config=linux_x86_64 "${bp2build_progress_script}" -- graph -m "${m}" > "${bp2build_progress_output_dir}/${m}_graph.dot" + build/bazel/bin/bazel run ${FLAGS} --config=linux_x86_64 "${bp2build_progress_script}" -- graph -m "${m}" --out-file=$( realpath "${bp2build_progress_output_dir}" )"/${m}_graph.dot" fi done build/bazel/bin/bazel run ${FLAGS} --config=linux_x86_64 "${bp2build_progress_script}" -- \ report ${report_args} \ --proto-file=$( realpath "${bp2build_progress_output_dir}" )"/bp2build-progress.pb" \ - > "${bp2build_progress_output_dir}/progress_report.txt" + --out-file=$( realpath "${bp2build_progress_output_dir}" )"/progress_report.txt" \ |