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

2 files changed, 11 insertions, 6 deletions

diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index c2cd656..9297345 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -186,8 +186,8 @@
             'src',
           ],
           'dependencies': [
-            '../icu38/icu38.gyp:icui18n',
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icui18n',
+            '../icu/icu.gyp:icuuc',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
@@ -215,7 +215,7 @@
           'target_name': 'sqlite_shell',
           'type': 'executable',
           'dependencies': [
-            '../icu38/icu38.gyp:icuuc',
+            '../icu/icu.gyp:icuuc',
             'sqlite',
           ],
           'sources': [
diff --git a/third_party/sqlite/src/shell_icu_win.c b/third_party/sqlite/src/shell_icu_win.c
index d68cf8f..afea472 100644
--- a/third_party/sqlite/src/shell_icu_win.c
+++ b/third_party/sqlite/src/shell_icu_win.c
@@ -9,16 +9,21 @@
 ** Returns 0 on failure, nonzero on success.
 ** This a hack job of icu_utils.cc:Initialize().  It's Chrome-specific code.
 */
+
+#define ICU_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
 int sqlite_shell_init_icu() {
   HMODULE module;
   FARPROC addr;
   UErrorCode err;
-  
-  module = LoadLibrary(L"icudt38.dll");
+
+  wchar_t dll_name[12];
+  wsprintf(dll_name, L"icudt%2S.dll", U_ICU_VERSION_SHORT);
+  dll_name[11] = L'\0';
+  module = LoadLibrary(dll_name);
   if (!module)
     return 0;
 
-  addr = GetProcAddress(module, "icudt38_dat");
+  addr = GetProcAddress(module, ICU_DATA_SYMBOL);
   if (!addr)
     return 0;