commit 0fa85301dc9e3a45f0947f267c4d5b16c172bda7
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 07 11:01:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 07 11:01:34 2021 +0000
tree ad83d9a65590609209e29e93ddd61c18de8dc58f
parent 3d0a68fbb585b4a5d4f379fdbb3babfcbdccc536
parent d10de8bd7d198e5f9944dc38720e53d98533ef4d

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

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

Change-Id: If9ca0f92a1dd6edce46dc4d3e803b9d4231ae4a5

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 629d487..60c611e 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1711,7 +1711,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.