Have the gyp build use base SCons, not Hammer components, so it can...

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 45 matching lines @@
 #
 clvars = Variables('scons.opts', ARGUMENTS)
 clvars.AddVariables(
     ('BUILD_TARGET_DIR', '', 'Hammer'),
     ('CHROME_BUILD_TYPE', '', os.environ.get('CHROME_BUILD_TYPE', '')),
     ('CHROMIUM_BUILD', '', os.environ.get('CHROMIUM_BUILD', '')),
     BoolVariable('INCREMENTAL', '', os.environ.get('INCREMENTAL')),
 )
 
 
+if ARGUMENTS.get('_GYP'):
+  tool_list = ['chromium_builders']
+else:
+  tool_list = ['component_setup',
+               'chromium_builders',
+               'chromium_load_component',
+               'MSVSNew']
+
+
 root_env = Environment(
     # MSVSNew in the base environment?  Yes, the point is we can (and
     # want to) generate Visual Studio project and solution files from
     # any platform.
-    tools = ['component_setup',
-             'chromium_builders',
-             'chromium_load_component',
-             'MSVSNew'],
+    tools = tool_list,
     variables = clvars,
 
     # Requested list of system (shared) libraries, from the comma separated
     # SYSTEM_LIBS command-line argument
     req_system_libs = [],
     # All supported system libraries, for the help message
     all_system_libs = [],
 
     CHROME_SRC_DIR = '$MAIN_DIR/..',
     DESTINATION_ROOT = '$MAIN_DIR/$BUILD_TARGET_DIR',
@@ skipping 99 matching lines @@
 
 # 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.
 
+Default(None)  # Reset default target to empty.
 if root_env.get('_GYP'):
     webkit_sconscript = '$WEBKIT_DIR/tools/test_shell/test_shell_main${_GYP}.scons'
 else:
     webkit_sconscript = '$WEBKIT_DIR/webkit_main${_GYP}.scons'
 
 sconscript_map = dict(
     base = '$BASE_DIR/base_main${_GYP}.scons',
     breakpad = '$BREAKPAD_DIR/SConscript',
     chrome = '$CHROME_DIR/chrome_main${_GYP}.scons',
     gears = '$GEARS_DIR/SConscript',
@@ skipping 579 matching lines @@
   Help(help_fmt % (components, all_system_libs))
 
 # -------------------------------------------------------------------------
 
 # Invoke all the SConscripts in each of the environments that make sense on
 # this host-platform.
 BuildComponents(environment_list)
 
 # -------------------------------------------------------------------------
 
-Default(None)  # Reset default target to empty.
+if not root_env.get('_GYP'):
+  modes = GetTargetModes().keys()
 
-modes = GetTargetModes().keys()
+  if set(modes) - set(['msvs', 'xcode']):
+    # There's at least one mode being built besides the platform-
+    # independent 'msvs' or 'xcode' modes.  Build the current
+    # build_component's Alias as default--that is, "base" when we're
+    # in the base/ subdirectory, "chrome" under chrome/, etc.
+    Import('build_component')
+    Default(Alias(build_component))  # Set default target based on where built.
 
-if set(modes) - set(['msvs', 'xcode']):
-  # There's at least one mode being built besides the platform-
-  # independent 'msvs' or 'xcode' modes.  Build the current
-  # build_component's Alias as default--that is, "base" when we're
-  # in the base/ subdirectory, "chrome" under chrome/, etc.
-  Import('build_component')
-  Default(Alias(build_component))  # Set default target based on where built.
-
-if 'msvs' in modes:
-  # We're in --mode=msvs, so add its Alias(es) to the default targets.
-  Default(Alias('msvs'))
+  if 'msvs' in modes:
+    # We're in --mode=msvs, so add its Alias(es) to the default targets.
+    Default(Alias('msvs'))
 
 # -------------------------------------------------------------------------
 
 # This must occur after BuildComponents so that the dependency graph
 # will be populated.
 vs_env = windows_env.Clone()
 vs_env.Append(COMPONENT_VS_SOURCE_SUFFIXES = [
     '.def',
     '.ini',
     '.txt',
@@ skipping 42 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'),
 )
 
 # -------------------------------------------------------------------------