gyp: chromium.gyp_env behaves like .gyp/include.gypi

build/gyp_helper.py

Index: build/gyp_helper.py
diff --git a/build/gyp_helper.py b/build/gyp_helper.py
index 645943a0183217b955e79af284e842ab3bee883d..730ecbb58a3306dc57d0cd11be9a4110d3b54d35 100644
--- a/build/gyp_helper.py
+++ b/build/gyp_helper.py
@@ -42,7 +42,8 @@ def apply_gyp_environment_from_file(file_path):
     file_val = file_data.get(var)
     if file_val:
       if var in os.environ:
-        print 'INFO: Environment value for "%s" overrides value in %s.' % (
+        os.environ[var] = file_val + ' ' + os.environ[var];

[scottmg, 2015/02/25 19:58:20]

merging with a space seems wrong? e.g. GYP_GENERATORS is , separated.

[dshwang, 2015/02/26 09:30:30]

I only applied this change to GYP_DEFINES in next patch

+        print 'INFO: Environment value for "%s" overrides value in %s' % (

[scottmg, 2015/02/25 19:58:20]

This print seems incorrect now.

[dshwang, 2015/02/26 09:30:30]

yes, only GYP_DEFINES is overriden. other env values are replaced.

now the log is as follows:
INFO: Environment value for "GYP_DEFINES" overrides value in
/home/dshwang/chromium/chromium.gyp_env
INFO: Environment value for "GYP_GENERATORS" replaces value in
/home/dshwang/chromium/chromium.gyp_env

For your information, the log is as follow when ~/.gyp/include.gypi overrides
env values.
Using overrides found in ~/.gyp/include.gypi

             var, os.path.abspath(file_path)
         )
       else: