From 9d67a905b7cef47d8281873a7ea5605e30fc0fd5 Mon Sep 17 00:00:00 2001
From: Sam Delmerico <delmerico@google.com>
Date: Mon, 11 Apr 2022 12:25:18 +0000
Subject: [PATCH] revert addition of --skip-soong-test flag

aosp/2045666 attempted to permit passing the `--skip-soong-tests` flag
through the `b` command to `soong_ui`, but it has been causing problems.

Test: b build '...' --skip-soong-tests is not recognized
Test: build/bazel/ci/bp2build.sh
Change-Id: I02487841d8081218dc941cb04bfa1a9e148ab6af
---
 envsetup.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index c23f01b016..e7b85382d0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1782,17 +1782,15 @@ function _trigger_build()
 # Convenience entry point (like m) to use Bazel in AOSP.
 function b()
 (
-    local skip_tests=$(echo "$@" | grep -ow -- "--skip-soong-tests")
-    local bazel_args=(${@/--skip-soong-tests/})
     # Generate BUILD, bzl files into the synthetic Bazel workspace (out/soong/workspace).
-    _trigger_build "all-modules" bp2build USE_BAZEL_ANALYSIS= $skip_tests || 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 "$bazel_args" ]]; then
+    if [[ -z "$@" ]]; then
         # If there are no args, show help.
         bazel help
     else
         # Else, always run with the bp2build configuration, which sets Bazel's package path to the synthetic workspace.
-        bazel $bazel_args --config=bp2build
+        bazel "$@" --config=bp2build
     fi
 )