Remove the base_gfx project since it no longer has an external depend…

…encies. Replace it with base_i18n which encapsulates all ICU dependencies. BUG=none TEST=none Review URL: http://codereview.chromium.org/267048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29036 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Oct 14, 2009 · d34d79f · d34d79f
1 parent 7eab0d2
commit d34d79f
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 36 deletions.
diff --git a/app/app.gyp b/app/app.gyp
@@ -44,7 +44,7 @@
         'app_resources',
         'app_strings',
         '../base/base.gyp:base',
-        '../base/base.gyp:base_gfx',
+        '../base/base.gyp:base_i18n',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',

diff --git a/base/base.gyp b/base/base.gyp
@@ -10,10 +10,6 @@
     {
       'target_name': 'base',
       'type': '<(library)',
-      'dependencies': [
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-      ],
       'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
       'sources': [
         '../build/build_config.h',
@@ -131,6 +127,12 @@
         'fix_wp64.h',
         'float_util.h',
         'foundation_utils_mac.h',
+        'gfx/point.cc',
+        'gfx/point.h',
+        'gfx/rect.cc',
+        'gfx/rect.h',
+        'gfx/size.cc',
+        'gfx/size.h',
         'global_descriptors_posix.h',
         'global_descriptors_posix.cc',
         'hash_tables.h',
@@ -140,18 +142,6 @@
         'hmac_mac.cc',
         'hmac_nss.cc',
         'hmac_win.cc',
-        'i18n/file_util_icu.cc',
-        'i18n/file_util_icu.h',
-        'i18n/icu_string_conversions.cc',
-        'i18n/icu_string_conversions.h',
-        'i18n/icu_util.cc',
-        'i18n/icu_util.h',
-        'i18n/number_formatting.cc',
-        'i18n/number_formatting.h',
-        'i18n/time_formatting.cc',
-        'i18n/time_formatting.h',
-        'i18n/word_iterator.cc',
-        'i18n/word_iterator.h',
         'iat_patch.cc',
         'iat_patch.h',
         'id_map.h',
@@ -371,6 +361,9 @@
       'msvs_disabled_warnings': [
         4244, 4554, 4018, 4102,
       ],
+      'mac_framework_dirs': [
+        '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
+      ],
       'conditions': [
         [ 'OS == "linux" or OS == "freebsd"', {
             'variables' : {
@@ -514,26 +507,31 @@
       ],
     },
     {
-      'target_name': 'base_gfx',
+      'target_name': 'base_i18n',
       'type': '<(library)',
-      'msvs_guid': 'A508ADD3-CECE-4E0F-8448-2F5E454DF551',
-      'sources': [
-        'gfx/point.cc',
-        'gfx/point.h',
-        'gfx/rect.cc',
-        'gfx/rect.h',
-        'gfx/size.cc',
-        'gfx/size.h',
-      ],
-      'mac_framework_dirs': [
-        '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
-      ],
+      'msvs_guid': '968F3222-9798-4D21-BE08-15ECB5EF2994',
       'dependencies': [
         'base',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'export_dependent_settings': [
         'base',
       ],
+      'sources': [
+        'i18n/file_util_icu.cc',
+        'i18n/file_util_icu.h',
+        'i18n/icu_string_conversions.cc',
+        'i18n/icu_string_conversions.h',
+        'i18n/icu_util.cc',
+        'i18n/icu_util.h',
+        'i18n/number_formatting.cc',
+        'i18n/number_formatting.h',
+        'i18n/time_formatting.cc',
+        'i18n/time_formatting.h',
+        'i18n/word_iterator.cc',
+        'i18n/word_iterator.h',
+      ],
       'conditions': [
         ['OS == "linux" or OS == "freebsd"', {
           'dependencies': [
@@ -639,7 +637,7 @@
       ],
       'dependencies': [
         'base',
-        'base_gfx',
+        'base_i18n',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -504,7 +504,7 @@
         'theme_resources',
         '../app/app.gyp:app_base',
         '../base/base.gyp:base',
-        '../base/base.gyp:base_gfx',
+        '../base/base.gyp:base_i18n',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
@@ -4873,6 +4873,7 @@
         'test_support_common',
         'test_support_ui',
         'theme_resources',
+        '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
@@ -4906,6 +4907,7 @@
         'test_support_common',
         'test_support_ui',
         'theme_resources',
+        '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
@@ -4934,6 +4936,7 @@
         'test_support_common',
         'test_support_ui',
         'theme_resources',
+        '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
@@ -5627,6 +5630,7 @@
           'msvs_guid': '42ECD5EC-722F-41DE-B6B8-83764C8016DF',
           'dependencies': [
             '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
             'convert_dict_lib',
             '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
@@ -5865,6 +5869,8 @@
             'syncapi',
             'test_support_common',
             '../app/app.gyp:app_base',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',

diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
@@ -140,6 +140,7 @@
             'installer_util',
             'installer_util_strings',
             '../../base/base.gyp:base',
+            '../../base/base.gyp:base_i18n',
             '../../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
@@ -213,6 +214,7 @@
           'dependencies': [
             'installer_util',
             '../../base/base.gyp:base',
+            '../../base/base.gyp:base_i18n',
             '../../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
@@ -357,6 +359,7 @@
           'dependencies': [
             'installer_util',
             '../../base/base.gyp:base',
+            '../../base/base.gyp:base_i18n',
             '../../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
@@ -363,7 +363,7 @@
       'target_name': 'chrome_frame_perftests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base_gfx',
+        '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chrome/chrome.gyp:common',

diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
@@ -89,6 +89,7 @@
       'dependencies': [
         'courgette_lib',
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
@@ -113,6 +114,7 @@
       'dependencies': [
         'courgette_lib',
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [

diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
@@ -72,6 +72,7 @@
       'dependencies': [
         'ipc',
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [

diff --git a/media/media.gyp b/media/media.gyp
@@ -158,6 +158,7 @@
       'dependencies': [
         'media',
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',

diff --git a/net/net.gyp b/net/net.gyp
@@ -12,6 +12,7 @@
       'type': '<(library)',
       'dependencies': [
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../sdch/sdch.gyp:sdch',
         '../third_party/bzip2/bzip2.gyp:bzip2',
@@ -456,6 +457,7 @@
         'net',
         'net_test_support',
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
         '../third_party/bzip2/bzip2.gyp:bzip2',
@@ -591,6 +593,7 @@
         'net',
         'net_test_support',
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:test_support_perf',
         '../testing/gtest.gyp:gtest',
@@ -629,6 +632,7 @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
+        '../base/base.gyp:base_i18n',
         '../build/temp_gyp/googleurl.gyp:googleurl',
       ],
       'msvs_guid': 'E13045CD-7E1F-4A41-9B18-8D288B2E7B41',

diff --git a/printing/printing.gyp b/printing/printing.gyp
@@ -13,7 +13,7 @@
       'dependencies': [
         '../app/app.gyp:app_base',  # Only required for Font support
         '../base/base.gyp:base',
-        '../base/base.gyp:base_gfx',
+        '../base/base.gyp:base_i18n',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',

diff --git a/tools/memory_watcher/memory_watcher.gyp b/tools/memory_watcher/memory_watcher.gyp
@@ -11,7 +11,6 @@
       'dependencies': [
         '../../app/app.gyp:*',
         '../../base/base.gyp:base',
-        '../../base/base.gyp:base_gfx',
       ],
       'defines': [
         'BUILD_MEMORY_WATCHER',

diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
@@ -28,7 +28,7 @@
       'dependencies': [
         '../../../app/app.gyp:app_base',
         '../../../base/base.gyp:base',
-        '../../../base/base.gyp:base_gfx',
+        '../../../base/base.gyp:base_i18n',
         '../../../media/media.gyp:media',
         '../../../net/net.gyp:net',
         '../../../skia/skia.gyp:skia',