From 90d07bc72d3658c34ee43e92a1551459d67e1750 Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Thu, 4 Jun 2020 10:48:15 -0700
Subject: [PATCH] Do not print environment variables if ANDROID_QUIET_BUILD is
 set.

Test: manual
Change-Id: I17c24beb9f0008e038a739a06027266b57e17e7a
---
 envsetup.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index 0ec7e6ffd2..e981034979 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -650,7 +650,6 @@ function lunch()
     export TARGET_BUILD_APPS=
 
     local product variant_and_version variant version
-
     product=${selection%%-*} # Trim everything after first dash
     variant_and_version=${selection#*-} # Trim everything up to first dash
     if [ "$variant_and_version" != "$selection" ]; then
@@ -675,7 +674,6 @@ function lunch()
     then
         return 1
     fi
-
     export TARGET_PRODUCT=$(get_build_var TARGET_PRODUCT)
     export TARGET_BUILD_VARIANT=$(get_build_var TARGET_BUILD_VARIANT)
     if [ -n "$version" ]; then
@@ -685,10 +683,10 @@ function lunch()
     fi
     export TARGET_BUILD_TYPE=release
 
-    echo
+    [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || echo
 
     set_stuff_for_environment
-    printconfig
+    [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || printconfig
     destroy_build_var_cache
 }