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

build/gyp_helper.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file helps gyp_chromium and landmines correctly set up the gyp
 # environment from chromium.gyp_env on disk
 
 import os
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
@@ skipping 24 matching lines @@
       'GYP_GENERATOR_OUTPUT',
       'GYP_GENERATORS',
       'GYP_INCLUDE_FIRST',
       'GYP_INCLUDE_LAST',
       'GYP_MSVS_VERSION',
   )
   for var in supported_vars:
     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:
         os.environ[var] = file_val
 
 
 def apply_chromium_gyp_env():
   if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ:
     # Update the environment based on chromium.gyp_env
     path = os.path.join(os.path.dirname(CHROME_SRC), 'chromium.gyp_env')
     apply_gyp_environment_from_file(path)