Update Linux gyp build to import and propagate external environment...

site_scons/site_tools/chromium_builders.py

 # Copyright (c) 2006-2008 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.
 
 """
 Tool module for adding, to a construction environment, Chromium-specific
 wrappers around Hammer builders.  This gives us a central place for any
 customization we need to make to the different things we build.
 """
 
@@ skipping 128 matching lines @@
   else:
     result = env.ComponentTestProgram(target, source, *args, **kw)
   if env.get('INCREMENTAL'):
     env.Precious(*result)
   return result
 
 def ChromeLibrary(env, target, source, *args, **kw):
   source = compilable_files(env, source)
   if env.get('_GYP'):
     lib = env.Library(target, source, *args, **kw)
-    result = env.Install('$DESTINATION_ROOT/$BUILD_TYPE/lib', lib)
+    result = env.Install('$LIB_DIR', lib)
   else:
     result = env.ComponentLibrary(target, source, *args, **kw)
   return result
 
 def ChromeLoadableModule(env, target, source, *args, **kw):
   source = compilable_files(env, source)
   if env.get('_GYP'):
     result = env.LoadableModule(target, source, *args, **kw)
   else:
     kw['COMPONENT_STATIC'] = True
     result = env.LoadableModule(target, source, *args, **kw)
   return result
 
 def ChromeStaticLibrary(env, target, source, *args, **kw):
   source = compilable_files(env, source)
   if env.get('_GYP'):
     lib = env.StaticLibrary(target, source, *args, **kw)
-    result = env.Install('$DESTINATION_ROOT/$BUILD_TYPE/lib', lib)
+    result = env.Install('$LIB_DIR', lib)
   else:
     kw['COMPONENT_STATIC'] = True
     result = env.ComponentLibrary(target, source, *args, **kw)
   return result
 
 def ChromeSharedLibrary(env, target, source, *args, **kw):
   source = compilable_files(env, source)
   if env.get('_GYP'):
     lib = env.SharedLibrary(target, source, *args, **kw)
-    result = env.Install('$DESTINATION_ROOT/$BUILD_TYPE/lib', lib)
+    result = env.Install('$LIB_DIR', lib)
   else:
     kw['COMPONENT_STATIC'] = False
     result = [env.ComponentLibrary(target, source, *args, **kw)[0]]
   if env.get('INCREMENTAL'):
     env.Precious(result)
   return result
 
 def ChromeObject(env, *args, **kw):
   if env.get('_GYP'):
     result = env.Object(target, source, *args, **kw)
@@ skipping 46 matching lines @@
   env.AddMethod(ChromeStaticLibrary)
   env.AddMethod(ChromeSharedLibrary)
   env.AddMethod(ChromeObject)
   env.AddMethod(ChromeMSVSFolder)
   env.AddMethod(ChromeMSVSProject)
   env.AddMethod(ChromeMSVSSolution)
 
   env.AddMethod(FilterOut)
 
   # Add the grit tool to the base environment because we use this a lot.
-  sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath)
-  env.Tool('scons', toolpath=[env.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
+  sys.path.append(env.Dir('$SRC_DIR/tools/grit').abspath)
+  env.Tool('scons', toolpath=[env.Dir('$SRC_DIR/tools/grit/grit')])
 
   # Add the repack python script tool that we use in multiple places.
-  sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/data_pack').abspath)
-  env.Tool('scons', toolpath=[env.Dir('$CHROME_SRC_DIR/tools/data_pack/')])
+  sys.path.append(env.Dir('$SRC_DIR/tools/data_pack').abspath)
+  env.Tool('scons', toolpath=[env.Dir('$SRC_DIR/tools/data_pack/')])
 
 def exists(env):
   return True