Move the logic for getting icu data out of icu_util

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 97e8596bd021e114af6db6b25e4439b7ddb5c89b..76f0838af42cd8a109c8e74e48c354e35d42bba3 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1217,6 +1217,10 @@
     # Relative path to icu.gyp from this file.
     'icu_gyp_path': '../third_party/icu/icu.gyp',
 
+    # Whether or not to use "icu*.dat" file for ICU data.
+    # Do not use it by default.
+    'icu_use_data_file_flag%': 0,

[Mark Mentovai, 2013/12/02 17:24:53]

_flag is kind of obvious, I’d just call it icu_use_data_file.

[jungshik at Google, 2013/12/02 18:36:54]

I also wondered why icu.gyp has that and found that it's added in
https://codereview.chromium.org/6474038 by Thomas for the following reason:

"Rename the variable to not end in "_file" since that triggers gyp relative
path munging when you try to set it in common.gypi."

I guess it's still the case.  (I haven't tried without _flag, yet)

+
     'conditions': [
       # The version of GCC in use, set later in platforms that use GCC and have
       # not explicitly chosen to build with clang. Currently, this means all
@@ -2157,6 +2161,17 @@
       ['use_udev==1', {
         'defines': ['USE_UDEV'],
       }],
+      ['icu_use_data_file_flag==1', {
+        'defines': ['ICU_UTIL_DATA_IMPL=0'], # use 'dat' file

[Mark Mentovai, 2013/12/02 17:24:53]

You can say “=ICU_UTIL_DATA_FILE” instead of “=0” here. Similar on lines 2169
and 2171. That’s self-documenting and eliminates the need for the comment.

+      }, { # else icu_use_data_file_flag !=1
+        'conditions': [
+          ['OS=="win"', {
+            'defines': ['ICU_UTIL_DATA_IMPL=1'], # shared
+          }, {
+            'defines': ['ICU_UTIL_DATA_IMPL=2'], # static link
+          }],
+        ],
+      }],
       ['fastbuild!=0', {
         'xcode_settings': {
           'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO',