commit af7f572207313b32ea0393ac8067e21df04965e3
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 07 09:43:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 07 09:43:42 2021 +0000
tree 8b104555fe9c5b6a7a6fa31abcc009121059f36e
parent d351f7c84844aa0ca749b25bae64b3fc25b0d4ae
parent f673d1073606076f60223004fdaf759f6727d5f8

Merge "Replace GENERATE_BAZEL_FILES=1 with "m bp2build"." am: f673d10736

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

Change-Id: I06c95a0c54494a2534b4c2cf08f722f5769dc4dc

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.