commit bc79a69b6ba5797e8f06296e36e39a04c3c3f784
author jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jan 28 15:00:04 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 15:58:59 2020 +0900
tree 665795410767fac2968e6480b202dae386a119ab
parent e8e1902c63902692a907f258a4239b59f76b047d

Use icudat*.dat file on Mac

1. Set icu_use_data_file_flag to 1 in common.gypi
2. Add icudatl.dat to the resournce bundle list in
chrome_dll_bundle.gypi and content_shell.gypi
3. Move ICU_UTIL_DATA_IMPL to base.gyp

This CL has to be landed after
https://codereview.chromium.org/111723007/ is landed and rolled in. 
(done in https://codereview.chromium.org/118313004/ )

Note to perf-sheriff: This CL adds ~10MB to the resource bundle while cutting down the same amount from the Chrome executable/binary.  

BUG=72633
TEST=All the Mac builds (static, shared) go through and tests (e.g.
layout tests, base_unittests --gtest_filter=*String*, net_unittests
--gtest_filter=*IDN*) loading the ICU data pass.

Review URL: https://codereview.chromium.org/109013004

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


CrOS-Libchrome-Original-Commit: 30c246bcec1dfa7d675fce49c6a017d32b658211

base/base.gyp

diff --git a/base/base.gyp b/base/base.gyp
index 6aa6cf8..cb0731d 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -306,6 +306,17 @@
             4267,
           ],
         }],
+        ['icu_use_data_file_flag==1', {
+          'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
+        }, { # else icu_use_data_file_flag !=1
+          'conditions': [
+            ['OS=="win"', {
+              'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'],
+            }, {
+              'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
+            }],
+          ],
+        }],
       ],
       'export_dependent_settings': [
         'base',