commit d10de8bd7d198e5f9944dc38720e53d98533ef4d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 07 10:48:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 07 10:48:16 2021 +0000
tree dd1a3112773533803ce1acf485a4cef3cef3b7c8
parent da9731b576f8456de6baa16965e4231125d7752e
parent 375370fdaa9c4c40684fde59867883caf8665362

Merge "Replace GENERATE_BAZEL_FILES=1 with "m bp2build"." am: f673d10736 am: af7f572207 am: d6d5fbd463 am: 375370fdaa

Original change: https://android-review.googlesource.com/c/platform/build/+/1818098

Change-Id: I5f9521e41b5cb4df16c5a5999e9f9580241b67e1

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 6085f7a..d70e815 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1707,7 +1707,7 @@
 function b()
 (
     # Generate BUILD, bzl files into the synthetic Bazel workspace (out/soong/workspace).
-    _trigger_build "all-modules" nothing GENERATE_BAZEL_FILES=true USE_BAZEL_ANALYSIS= || return 1
+    _trigger_build "all-modules" bp2build USE_BAZEL_ANALYSIS= || return 1
     # Then, run Bazel using the synthetic workspace as the --package_path.
     if [[ -z "$@" ]]; then
         # If there are no args, show help.