Start stitching GYP-generated files into the Linux build:...

build/SConscript.main

 # 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.
 
 import os
 import shutil
 import sys
 
 
 if sys.platform == 'win32':
@@ skipping 131 matching lines @@
     PERL                  = 'perl',
     PERL_INCLUDE_FLAG     = '-I ',
     PERL_INCLUDE_SUFFIX   = '',
     _PERL_INCLUDE_FLAGS   = ('${_concat(PERL_INCLUDE_FLAG, '
                              'PERL_INCLUDE_PATH, '
                              'PERL_INCLUDE_SUFFIX,'
                              '__env__, RDirs, TARGET, SOURCE)}'),
 )
 
 root_env['req_system_libs'] = ARGUMENTS.get('SYSTEM_LIBS', '').split(',')
+root_env['_GYP'] = ARGUMENTS.get('GYP') and '_gyp' or ''
 
 def WantSystemLib(env, lib):
   """
   Return true if lib has been requested as a system library in SYSTEM_LIBS.
   """
   if lib not in env['all_system_libs']:
     env['all_system_libs'].append(lib)
   return (lib in env['req_system_libs'])
 root_env.AddMethod(WantSystemLib, "WantSystemLib")
 
@@ skipping 19 matching lines @@
 root_env.ApplySConscript(['$CHROME_SRC_DIR/build/common.scons'])
 
 # The list of all leaf (fully described) environments.
 environment_list = []
 components = []
 
 # Figure out what SConscript files to load based on the user's request.
 # Default is to load all SConscript files for a full-tree build.
 # The keyword arguments in the call below (base, breakpad, etc.) can be
 # specified in the LOAD= argument to cut down on the build.
-sconscripts = root_env.ChromiumLoadComponentSConscripts(
-    base = '$BASE_DIR/base.scons',
+sconscript_map = dict(
+    base = '$BASE_DIR/base_main${_GYP}.scons',
     breakpad = '$BREAKPAD_DIR/SConscript',
     chrome = '$CHROME_DIR/chrome.scons',
     gears = '$GEARS_DIR/SConscript',
     google_update = '$GOOGLE_UPDATE_DIR/SConscript',
     googleurl = '$GOOGLEURL_DIR/googleurl.scons',
     media = '$MEDIA_DIR/media.scons',
     net = '$NET_DIR/net.scons',
     printing = '$PRINTING_DIR/printing.scons',
     rlz = '$RLZ_DIR/SConscript',
     sandbox = '$SANDBOX_DIR/sandbox.scons',
     sdch = '$SDCH_DIR/SConscript',
     skia = '$SKIA_DIR/SConscript',
     testing = '$TESTING_DIR/SConscript.gtest',
     third_party = [
         '$BSDIFF_DIR/bsdiff.scons',
         '$BSPATCH_DIR/bspatch.scons',
         '$BZIP2_DIR/bzip2.scons',
-        '$ICU38_DIR/icu38.scons',
-        '$LIBJPEG_DIR/libjpeg.scons',
-        '$LIBPNG_DIR/libpng.scons',
+        '$ICU38_DIR/icu38_main${_GYP}.scons',
+        '$LIBJPEG_DIR/libjpeg${_GYP}.scons',
+        '$LIBPNG_DIR/libpng${_GYP}.scons',
         '$LIBXML_DIR/libxml.scons',
         '$LIBXSLT_DIR/libxslt.scons',
         '$LZMA_SDK_DIR/lzma_sdk.scons',
         '$MODP_B64_DIR/modp_b64.scons',
-        '$ZLIB_DIR/zlib.scons',
+        '$ZLIB_DIR/zlib${_GYP}.scons',
     ],
     tools = '$GTK_CLIP_DUMP_DIR/gcd.scons',
     v8 = '$OBJ_ROOT/build/SConscript.v8',
     webkit = '$WEBKIT_DIR/webkit.scons',
 )
 
+if root_env.get('_GYP'):
+  Import('build_component')
+  sconscripts = [sconscript_map[build_component]]
+  components = [build_component]
+else:
+  sconscripts = root_env.ChromiumLoadComponentSConscripts(**sconscript_map)
+
 # Add the final list into the root environment to be build in BuildComponents.
 root_env.Append(BUILD_SCONSCRIPTS = sconscripts)
 
-if not root_env.WantSystemLib('sqlite'):
+if not root_env.WantSystemLib('sqlite') and not root_env.get('_GYP'):
   root_env.Append(BUILD_SCONSCRIPTS = ['$SQLITE_DIR/SConscript'])
 
 
 # --------------------------------------------------------------------------
 # Windows specific
 
 windows_env = root_env.Clone()
 
 # TODO(siggi) Remove this code once SCons plays well when the 
 # Platform SDK 6.1 is installed with VS2005 but not VS2008.
@@ skipping 208 matching lines @@
                'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE',
                'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'):
   if envvar in os.environ:
     linux_env['ENV'][envvar] = os.environ[envvar]
 
 excluded_warnings = [
   # TODO: Clean up uses of ext/hash_map and remove this.
   # (see unordered_map and base/hash_tables.h)
   '-Wno-deprecated',  # Needed for using ext/hash_map on GCC 4.3
 ]
+if not root_env.get('_GYP'):
+  linux_env.Append(
+    BUILD_SCONSCRIPTS = [
+        '$LIBEVENT_DIR/libevent${_GYP}.scons',
+    ],
+  )
 linux_env.Append(
-    BUILD_SCONSCRIPTS = [
-        '$LIBEVENT_DIR/libevent.scons',
-    ],
+    ASFLAGS = ['-32'],
     CCFLAGS = ['-m32', '-pthread', '-march=i686', '-fno-exceptions'],
     # GCC will generate ident directives with the GCC version. Accumulate
     # these all up and you end up with ~80K repeated in a .comment section.
     CCFLAGS_OPTIMIZED = ['-fno-ident'],
     CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings,
     LINKFLAGS = ['-m32', '-pthread'],
 )
 
 linux_env.Replace(
     # Linking of large files uses lots of RAM, so serialize links
@@ skipping 167 matching lines @@
         '$RLZ_DIR/SConscript',
         '$SANDBOX_DIR/sandbox.scons',
         '$WEBKIT_DIR/SConscript',
         'build/SConscript.v8',
     ],
 )
 # TODO(bradnelson): this is needed for now because target_platform_mac has
 # OS_MACOSX defined in a weird way.
 mac_env.FilterOut(CPPDEFINES = ['OS_MACOSX=OS_MACOSX'])
 
-if not root_env.WantSystemLib('libevent'):
+if not root_env.WantSystemLib('libevent') and not root_env.get('_GYP'):
   mac_env.Append(
     BUILD_SCONSCRIPTS = [
-        '$LIBEVENT_DIR/libevent.scons',
+        '$LIBEVENT_DIR/libevent${_GYP}.scons',
     ],
   )
 mac_env.Append(
     CFLAGS = [
         '-std=c99',
     ],
     CXXFLAGS = [
         '-fvisibility-inlines-hidden',
         '${str(SOURCE).endswith(".mm") and "-fobjc-gc" or ""}',
     ],
@@ skipping 79 matching lines @@
   LOAD=[module,...]         Comma-separated list of components to load in the
                               dependency graph ('-' prefix excludes):
 %s
   SYSTEM_LIBS=[lib,...]     Comma-separated list of system libraries to link
                               dynamically (by default they are built in from
                               included sources):
 %s
   PROGRESS=type             Display a progress indicator:
                               name:  print each evaluated target name
                               spinner:  print a spinner every 5 targets
+  GYP=1                     Any non-null value uses GYP-generated files
+                              (*_gyp.scons).
 """
 
 if GetOption('help'):
   import textwrap
   tw = textwrap.TextWrapper(
     width = 78,
     initial_indent = ' '*32,
     subsequent_indent = ' '*32,
   )
   components = tw.fill(', '.join(components))
@@ skipping 79 matching lines @@
         'all_libraries',
         'all_languages',
         'all_programs',
         'all_test_programs',
     ], projects = [p],
     COMPONENT_VS_PROJECT_SCRIPT_PATH=(
         'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
 )
 
 # -------------------------------------------------------------------------