Replace icu38/icu38.gyp with icu/icu.gyp in gyp files replace all the references to third_party/icu38 and icudt38.dll with third_party/icu and icudt42.dll in vsprops and cc files. Also, update the icu data module name and the icu data symbol in icu_util.cc

In addition, add a dummy C++ source file (xmldummy_mac.cc) to libxml to work around an Xcode bug (xmllint and xmlcatalog are linked with gcc rather than g++ even though it's linked to a "C++ library", libicuuc.a). 

Also updated is the test results for net_util_unittests.


This will not be landed until deps/third_party/icu42 is ready for all 3 platforms (Windows VS build files are not yet updated there). 

BUG=8198
TEST=On all platforms, all the targets are built fine.

Review URL: http://codereview.chromium.org/172031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25708 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 22 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3f67e10..57b4551 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -406,8 +406,8 @@
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
@@ -671,8 +671,8 @@
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
@@ -2674,8 +2674,8 @@
         'chrome_strings',
         'theme_resources',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
       ],
       'include_dirs': [
         '..',
@@ -2722,8 +2722,8 @@
         'chrome_strings',
         '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/hunspell/hunspell.gyp:hunspell',
@@ -2781,8 +2781,8 @@
         'chrome_strings',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         '../webkit/webkit.gyp:glue',
         '../webkit/webkit.gyp:webkit',
@@ -3744,8 +3744,8 @@
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
       'include_dirs': [
@@ -3898,8 +3898,8 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/bzip2/bzip2.gyp:bzip2',
-        '../third_party/icu38/icu38.gyp:icui18n',
-        '../third_party/icu38/icu38.gyp:icuuc',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
@@ -5179,7 +5179,7 @@
             '../third_party/hunspell/hunspell.gyp:hunspell',
             '../net/net.gyp:net_resources',
             '../skia/skia.gyp:skia',
-            '../third_party/icu38/icu38.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icui18n',
             '../third_party/libpng/libpng.gyp:libpng',
             '../third_party/libxml/libxml.gyp:libxml',
             '../third_party/zlib/zlib.gyp:zlib',
@@ -5309,8 +5309,8 @@
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../third_party/icu38/icu38.gyp:icui18n',
-            '../third_party/icu38/icu38.gyp:icuuc',
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
           ],
           'include_dirs': [
             '..',
@@ -5381,7 +5381,7 @@
             '../third_party/bzip2/bzip2.gyp:*',
             '../third_party/cld/cld.gyp:cld',
             '../third_party/codesighs/codesighs.gyp:*',
-            '../third_party/icu38/icu38.gyp:*',
+            '../third_party/icu/icu.gyp:*',
             '../third_party/libjpeg/libjpeg.gyp:*',
             '../third_party/libpng/libpng.gyp:*',
             '../third_party/libxml/libxml.gyp:*',
@@ -5511,8 +5511,8 @@
               '../webkit/webkit.gyp:webkit',
               '../skia/skia.gyp:skia',
               '../testing/gtest.gyp:gtest',
-              '../third_party/icu38/icu38.gyp:icui18n',
-              '../third_party/icu38/icu38.gyp:icuuc',
+              '../third_party/icu/icu.gyp:icui18n',
+              '../third_party/icu/icu.gyp:icuuc',
               '../third_party/libxml/libxml.gyp:libxml',
               '../third_party/npapi/npapi.gyp:npapi',
             ],
@@ -5594,8 +5594,8 @@
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
-            '../third_party/icu38/icu38.gyp:icui18n',
-            '../third_party/icu38/icu38.gyp:icuuc',
+            '../third_party/icu/icu.gyp:icui18n',
+            '../third_party/icu/icu.gyp:icuuc',
           ],
           'include_dirs': [
             '..',