Fix use of LOAD= with WantSystemLib()...

chrome/chrome.scons

 # 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.
 
 __doc__ = """
 Master configuration for building chrome components.
 """
 
 Import('env')
 
@@ skipping 20 matching lines @@
     # NOTE: the / after $CHROME_SRC_DIR/chrome/ is required because
     # version.bat assumes a path with a trailing slash.
     CHROME_VERSION_RC_COM =
         '$VERSION_BAT $SOURCE $CHROME_SRC_DIR/chrome/ $PWD $TARGET',
     VERSION_BAT = env.File(
         '$CHROME_SRC_DIR/chrome/tools/build/win/version.bat'),
     PWD = Dir('.'),
 )
 
 
-sconscript_files = [
+sconscript_files = env.ChromiumLoadComponentSConscripts(
     'SConscript',
 
-    'browser/browser.scons',
-    'browser/debugger/debugger.scons',
-    'common/common.scons',
-    'common/ipc_tests.scons',
-    'installer/mini_installer/installer_unittests.scons',
-    'installer/mini_installer/mini_installer.scons',
-    'installer/setup/setup.scons',
-    'installer/util/util.scons',
-    'plugin/plugin.scons',
-    'renderer/renderer.scons',
-    'test/activex_test_control/activex_test_control.scons',
-    'test/automated_ui_tests/automated_ui_tests.scons',
-    'test/automation/automation.scons',
-    'test/chrome_plugin/test_chrome_plugin.scons',
-    'test/interactive_ui/interactive_ui_tests.scons',
-    'test/memory_test/memory_test.scons',
-    'test/mini_installer_test/mini_installer_test.scons',
-    'test/page_cycler/page_cycler_tests.scons',
-    'test/plugin/plugin_tests.scons',
-    'test/reliability/reliability_tests.scons',
-    'test/security_tests/security_tests.scons',
-    'test/selenium/selenium_tests.scons',
-    'test/startup/startup_tests.scons',
-    'test/tab_switching/tab_switching_test.scons',
-    'test/ui/ui_tests.scons',
-    'test/unit/unit_tests.scons',
-    'tools/crash_service/crash_service.scons',
-    'tools/perf/flush_cache/flush_cache.scons',
-    'tools/test/image_diff/image_diff.scons',
-]
+    LOAD_NAMES = ['chrome'],
+
+    browser             = 'browser/browser.scons',
+    debugger            = 'browser/debugger/debugger.scons',
+    common              = 'common/common.scons',
+    ipc_tests           = 'common/ipc_tests.scons',
+    installer_unittests = 'installer/mini_installer/installer_unittests.scons',
+    mini_installer      = 'installer/mini_installer/mini_installer.scons',
+    setup               = 'installer/setup/setup.scons',
+    util                = 'installer/util/util.scons',
+    plugin              = 'plugin/plugin.scons',
+    renderer            = 'renderer/renderer.scons',
+    activex_test_controls = 'test/activex_test_control/activex_test_control.scons',

[Evan Martin, 2008/11/20 21:11:42]

80 columns :\

[sgk, 2008/11/21 01:06:28]

Done.

+    automated_ui_tests  = 'test/automated_ui_tests/automated_ui_tests.scons',
+    automtion           = 'test/automation/automation.scons',
+    test_chrome_plugin  = 'test/chrome_plugin/test_chrome_plugin.scons',
+    interactive_ui_tests = 'test/interactive_ui/interactive_ui_tests.scons',
+    memory_test         = 'test/memory_test/memory_test.scons',
+    mini_installer_test = 'test/mini_installer_test/mini_installer_test.scons',
+    page_cycler_tests   = 'test/page_cycler/page_cycler_tests.scons',
+    plugin_tests        = 'test/plugin/plugin_tests.scons',
+    reliability_tests   = 'test/reliability/reliability_tests.scons',
+    security_tests      = 'test/security_tests/security_tests.scons',
+    selenium_tests      = 'test/selenium/selenium_tests.scons',
+    startup_tests       = 'test/startup/startup_tests.scons',
+    tab_switching_test  = 'test/tab_switching/tab_switching_test.scons',
+    ui_tests            = 'test/ui/ui_tests.scons',
+    unit_tests          = 'test/unit/unit_tests.scons',
+    crash_service       = 'tools/crash_service/crash_service.scons',
+    flush_cache         = 'tools/perf/flush_cache/flush_cache.scons',
+    image_diff          = 'tools/test/image_diff/image_diff.scons',
+)
 
 # TODO(port)
 if env['PLATFORM'] != 'win32':
   remove_files = [
       'browser/debugger/debugger.scons',
       'installer/mini_installer/installer_unittests.scons',
       'installer/mini_installer/mini_installer.scons',
       'installer/setup/setup.scons',
       'installer/util/util.scons',
       'test/activex_test_control/activex_test_control.scons',
       'test/automated_ui_tests/automated_ui_tests.scons',
       'test/automation/automation.scons',
       'test/interactive_ui/interactive_ui_tests.scons',
       'test/memory_test/memory_test.scons',
       'test/mini_installer_test/mini_installer_test.scons',
       'test/page_cycler/page_cycler_tests.scons',
       'test/plugin/plugin_tests.scons',
       'test/reliability/reliability_tests.scons',
       'test/security_tests/security_tests.scons',
       'test/selenium/selenium_tests.scons',
       'test/startup/startup_tests.scons',
       'test/tab_switching/tab_switching_test.scons',
       'test/ui/ui_tests.scons',
       'tools/crash_service/crash_service.scons',
       'tools/perf/flush_cache/flush_cache.scons',
   ]
-  for remove in remove_files:
-    sconscript_files.remove(remove)
+  sconscript_files = list(set(sconscript_files) - set(remove_files))
 
 SConscript(sconscript_files, exports=['env'])