SCons renaming updates for base, net and googleurl:...

base/gfx/base_gfx.scons

Index: base/gfx/base_gfx.scons
===================================================================
--- base/gfx/base_gfx.scons	(revision 3638)
+++ base/gfx/base_gfx.scons	(working copy)
@@ -2,31 +2,25 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+__doc__ = """
+Configuration for building base_gfx.lib / libbase_gfx.a.
+"""
+
 Import('env')
 
 env = env.Clone()
 
-# Remove an inherited relative path that doesn't make sense anymore.  This
-# makes sure we don't pull in the wrong version of time.h when building on
-# linux.
-env['CPPPATH'].remove('..')
+env.SConscript([
+    '$ICU38_DIR/using_icu38.scons',
+    '$LIBPNG_DIR/using_libpng.scons',
+    '$SKIA_DIR/using_skia.scons',
+    '$ZLIB_DIR/using_zlib.scons',
+], {'env':env})
 
 env.Prepend(
     CPPPATH = [
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/include/platform',
-        '$ZLIB_DIR',
-        '$LIBPNG_DIR',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '../..',
+        '$ROOT_DIR',
     ],
-    CPPDEFINES = [
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-        'U_STATIC_IMPLEMENTATION',
-    ],
 )
 
 if env['PLATFORM'] == 'win32':
@@ -38,40 +32,48 @@
   )
 
 input_files = [
-  'convolver.cc',
-  'image_operations.cc',
-  'png_decoder.cc',
-  'png_encoder.cc',
-  'point.cc',
-  'rect.cc',
-  'size.cc',
-]
-
-if env['PLATFORM'] == 'win32':
-  # Some of these aren't really Windows-specific, they're just here until
-  # we have the port versions working.
-  input_files.extend([
+    'convolver.cc',
     'font_utils.cc',
     'gdi_util.cc',
+    'image_operations.cc',
     'native_theme.cc',
+    'png_decoder.cc',
+    'png_encoder.cc',
+    'point.cc',
+    'rect.cc',
+    'size.cc',
     'skia_utils.cc',
     'uniscribe.cc',
     'vector_canvas.cc',
     'vector_device.cc',
-  ])
+]
 
+if env['PLATFORM'] in ('posix', 'darwin'):
+  # Remove files that still need to be ported from the input_files list.
+  # TODO(port): delete files from this list as they get ported.
+  to_be_ported_files = [
+      'font_utils.cc',
+      'gdi_util.cc',
+      'native_theme.cc',
+      'skia_utils.cc',
+      'uniscribe.cc',
+      'vector_canvas.cc',
+      'vector_device.cc',
+  ]
+  for remove in to_be_ported_files:
+    input_files.remove(remove)
+
 if env['PLATFORM'] == 'win32':
   input_files.extend([
-    'bitmap_platform_device_win.cc',
-    'platform_canvas_win.cc',
-    'platform_device_win.cc',
+      'bitmap_platform_device_win.cc',
+      'platform_canvas_win.cc',
+      'platform_device_win.cc',
   ])
 elif env['PLATFORM'] == 'posix':
   input_files.extend([
-    'bitmap_platform_device_linux.cc',
-    'platform_canvas_linux.cc',
-    'platform_device_linux.cc',
+      'bitmap_platform_device_linux.cc',
+      'platform_canvas_linux.cc',
+      'platform_device_linux.cc',
   ])
 
 env.ChromeStaticLibrary('base_gfx', input_files)
-
Property changes on: base/gfx/base_gfx.scons
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/SConscript:r69-2775