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..23fe9aa2b42d425551b200501cdc8df5e6d79b4c 100644
--- a/build/gyp_helper.py
+++ b/build/gyp_helper.py
@@ -42,8 +42,12 @@ 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.' % (
-            var, os.path.abspath(file_path)
+        behavior = "replaces";

[scottmg, 2015/03/04 18:10:37]

please use ', not "

[dshwang, 2015/03/04 18:28:07]

yes, I'll update.

+        if var == 'GYP_DEFINES':
+          os.environ[var] = file_val + ' ' + os.environ[var];
+          behavior = "overrides"

[scottmg, 2015/03/04 18:10:37]

'overrides' doesn't seem correct. 'prepended to'? Also, ', not ".

[dshwang, 2015/03/04 18:28:07]

The behavior is 'prepended to', but if there is duplicated values, earlier one
is taken. So this behavior can be called as 'overrides'
In addition, ~/.gyp/include.gypi uses 'overrides' term so I wanted to match the
terminology.
`Using overrides found in ~/.gyp/include.gypi`
WDYT?

[scottmg, 2015/03/04 18:33:44]

Sigh, OK, fine as-is then.

`git rm build/gyp_helper.py` ftw.

+        print 'INFO: Environment value for "%s" %s value in %s' % (
+            var, behavior, os.path.abspath(file_path)
         )
       else:
         os.environ[var] = file_val