diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-08 17:50:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-08 17:50:48 +0000 |
| commit | 2f29eee98aa7a1c87da4613ada3b3707069edb1c (patch) | |
| tree | 42c7b9fdb73b44c73ebfba37dc394d4891e887ff | |
| parent | cd039509a66b84e8cfab4f8934307f3fc4f54a4b (diff) | |
| parent | 5d5a9db8d12557ba56f5a8c55f2d6b34693f4441 (diff) | |
| download | bazel-2f29eee98aa7a1c87da4613ada3b3707069edb1c.tar.gz | |
Merge "Enable artifact path requirements in comparison builds" am: 5d5a9db8d1
Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/2040746
Change-Id: Ia8bd648a4b5be0711108d6691283bdf19dd5e8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | ci/rbc_regression_test.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/rbc_regression_test.sh b/ci/rbc_regression_test.sh index 1eb34755..b1f4e575 100755 --- a/ci/rbc_regression_test.sh +++ b/ci/rbc_regression_test.sh @@ -38,7 +38,6 @@ mypath=$(realpath "$0") declare -r mydir=${mypath%/*/*/*/*} declare -r myname=${mypath#${mydir}/} -flags_mk=(RBC_NO_PRODUCT_GRAPH=true DISABLE_ARTIFACT_PATH_REQUIREMENTS=true) flags_rbc=() quiet= while getopts "bkpqr" o; do @@ -69,7 +68,7 @@ for arg in $@; do build RBC $product $variant ${flags_rbc[@]} && \ rm -rf $saved_ninja_dir && mkdir -p $saved_ninja_dir/soong && \ (for f in ${ninja_files[@]}; do mv -f out/$f $saved_ninja_dir/$f || exit 1; done) && \ - build baseline $product $variant ${flags_mk[@]} + build baseline $product $variant rc=$? # Compare Ninja files |