2 files changed, 19 insertions, 103 deletions
diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript
deleted file mode 100644
index 34ebf75..0000000
--- a/chrome/app/theme/SConscript
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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('env', 'env_res')
-
-env = env.Clone()
-env_res = env_res.Clone()
-
-env_res.Append(
-    CPPPATH = [
-        '.',
-        '$CHROME_SRC_DIR',
-    ],
-)
-
-if env.Bit('windows'):
-  env_res.Append(
-      RCFLAGS = [
-          ['/l', '0x409'],
-      ],
-  )
-
-  env.Append(
-      LINKFLAGS = [
-          '/INCREMENTAL:NO',
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-
-          '/NOENTRY',
-          '/BASE:"0x3CE00000"',
-          '/MACHINE:X86',
-          '/FIXED:No',
-
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
-  )
-
-# TODO(tc): We need to pass in a preprocessor define for official builds.
-generated = env.GRIT(
-    '$TARGET_ROOT/grit_derived_sources/fake_theme_target',
-    '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd')
-
-if env.Bit('windows'):
-  input_files = ChromeFileList([
-      '$TARGET_ROOT/grit_derived_sources/theme_resources.rc',
-  ])
-
-  # TODO(tc): This causes scons to die because the regular expression that
-  # scans .rc files for dependencies overflows (see
-  # SCons/Tool/Scanner/RC.py).  Disable it for now because it's only for the
-  # Windows build.
-  #res = env.RES('$TARGET_ROOT/grit_derived_sources/theme_resources.rc')
-
-  #themes_default = env.ChromeSharedLibrary("default", res)
-  #env.Install("$DESTINATION_ROOT/themes", themes_default)
-
-  p = env.ChromeMSVSProject('theme_dll.vcproj',
-                            dest=('$CHROME_SRC_DIR/chrome/'
-                                  + 'app/theme/theme_dll.vcproj'),
-                            guid='{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}',
-                            keyword='Win32Proj',
-                            # TODO(sgk):  when we can intuit the hierarchy
-                            # from the built targets.
-                            #buildtargets=TODO,
-                            files=input_files,
-                            tools=[
-                                'VCPreBuildEventTool',
-                                'VCCustomBuildTool',
-                                'VCXMLDataGeneratorTool',
-                                'VCWebServiceProxyGeneratorTool',
-                                'VCMIDLTool',
-                                'VCCLCompilerTool',
-                                'VCManagedResourceCompilerTool',
-                                'VCResourceCompilerTool',
-                                'VCPreLinkEventTool',
-                                'VCLinkerTool',
-                                'VCALinkTool',
-                                'VCManifestTool',
-                                'VCXDCMakeTool',
-                                'VCBscMakeTool',
-                                'VCFxCopTool',
-                                'VCAppVerifierTool',
-                                'VCWebDeploymentTool',
-                                'VCPostBuildEventTool',
-                            ],
-                            ConfigurationType='2')
-
-
-  p.AddConfig('Debug|Win32',
-              InheritedPropertySheets=[
-                  '$(SolutionDir)../build/debug.vsprops',
-                  './theme_dll.vsprops',
-              ])
-
-  p.AddConfig('Release|Win32',
-              InheritedPropertySheets=[
-                  '$(SolutionDir)../build/release.vsprops',
-                  './theme_dll.vsprops',
-              ])
diff --git a/chrome/app/theme/theme_dll.scons b/chrome/app/theme/theme_dll.scons
new file mode 100644
index 0000000..d99f9ee
--- /dev/null
+++ b/chrome/app/theme/theme_dll.scons
@@ -0,0 +1,19 @@
+# Copyright (c) 2009 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('env')
+
+env = env.Clone()
+
+# The fake target gets replaced with real targets when the GRIT Builder runs.
+generated = env.GRIT(
+    '$TARGET_ROOT/grit_derived_sources/fake_theme_resources.grd',
+    '$CHROME_SRC_DIR/chrome/app/theme/theme_resources.grd')
+
+if env.Bit('linux'):
+  theme_default_pak = env.Repack('$TARGET_ROOT/themes/default.pak',
+      ['$TARGET_ROOT/grit_derived_sources/theme_resources.pak']
+  )
+  i = env.Install('$DESTINATION_ROOT/themes/', theme_default_pak)
+  env.Requires('$DESTINATION_ROOT/chrome', i)