Move the main entry point *.scons files in the key remaining components...

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 174 matching lines @@
 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.
 sconscript_map = dict(
     base = '$BASE_DIR/base_main${_GYP}.scons',
     breakpad = '$BREAKPAD_DIR/SConscript',
-    chrome = '$CHROME_DIR/chrome.scons',
+    chrome = '$CHROME_DIR/chrome_main${_GYP}.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',
+    net = '$NET_DIR/net_main${_GYP}.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_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${_GYP}.scons',
     ],
     tools = '$GTK_CLIP_DUMP_DIR/gcd.scons',
     v8 = '$OBJ_ROOT/build/SConscript.v8',
-    webkit = '$WEBKIT_DIR/webkit.scons',
+    webkit = '$WEBKIT_DIR/webkit_main${_GYP}.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.
@@ skipping 401 matching lines @@
     LINK = '$CXX',
 )
 mac_env.FilterOut(SHCCFLAGS = ['-fPIC'])
 mac_env.FilterOut(SHLINKFLAGS = ['-fPIC'])
 
 mac_env.FilterOut(
     BUILD_SCONSCRIPTS = [
         '$BREAKPAD_DIR/SConscript',
         '$BSDIFF_DIR/bsdiff.scons',
         '$BSPATCH_DIR/bspatch.scons',
-        '$CHROME_DIR/chrome.scons',
+        '$CHROME_DIR/chrome_main${_GYP}.scons',
         '$GOOGLE_UPDATE_DIR/SConscript',
         '$LIBJPEG_DIR/libjpeg.scons',
         '$LIBXML_DIR/libxml.scons',
         '$LIBXSLT_DIR/libxslt.scons',
         '$RLZ_DIR/SConscript',
         '$SANDBOX_DIR/sandbox.scons',
         '$WEBKIT_DIR/SConscript',
         'build/SConscript.v8',
     ],
 )
@@ skipping 198 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'),
 )
 
 # -------------------------------------------------------------------------