From 867c51aa33e601cbca4321b2d94a9a3ca6e21eaa Mon Sep 17 00:00:00 2001
From: Dave Bort <>
Date: Tue, 24 Mar 2009 20:52:27 -0700
Subject: [PATCH] Automated import from //branches/master/...@141763,141763

---
 core/product_config.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/product_config.mk b/core/product_config.mk
index b55760f8b..f5fa53a55 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -156,7 +156,10 @@ PRODUCT_LOCALES := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_LOCALES))
 # in PRODUCT_LOCALES, add them to PRODUCT_LOCALES.
 extra_locales := $(filter-out $(PRODUCT_LOCALES),$(CUSTOM_LOCALES))
 ifneq (,$(extra_locales))
-  $(info Adding CUSTOM_LOCALES [$(extra_locales)] to PRODUCT_LOCALES [$(PRODUCT_LOCALES)])
+  ifneq ($(CALLED_FROM_SETUP),true)
+    # Don't spam stdout, because envsetup.sh may be scraping values from it.
+    $(info Adding CUSTOM_LOCALES [$(extra_locales)] to PRODUCT_LOCALES [$(PRODUCT_LOCALES)])
+  endif
   PRODUCT_LOCALES += $(extra_locales)
   extra_locales :=
 endif
-- 
2.11.0