[gn] Port icu_use_data_file_flag in gn

src/v8.gyp

Index: src/v8.gyp
diff --git a/src/v8.gyp b/src/v8.gyp
index 90044fcde67555698f9d213e7a4d11cdff01770b..768e5000208598baea4fe6d0bde4af07950b2779 100644
--- a/src/v8.gyp
+++ b/src/v8.gyp
@@ -1603,7 +1603,20 @@
           'dependencies': [
             '<(icu_gyp_path):icui18n',
             '<(icu_gyp_path):icuuc',
-          ]
+          ],

[Michael Achenbach, 2016/05/18 12:07:19]

This is just moved under the v8_enable_i18n_support==1 section. Like that it's
equal to how gn is configured now. The old just leads to unnecessary defines
when icu support is off.

+          'conditions': [
+            ['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'],
+                }],
+              ],
+            }],
+          ],
         }, {  # v8_enable_i18n_support==0
           'sources!': [
             'i18n.cc',
@@ -1615,17 +1628,6 @@
             '<(icu_gyp_path):icudata',
           ],
         }],
-        ['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'],
-            }],
-          ],
-        }],
       ],
     },
     {