| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index d005e6e897f3888b292de0925941a3f5f4d425be..4a074d5616b714d764ea51907a7117819bb4fd59 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -1318,6 +1318,9 @@
|
| }],
|
| ],
|
| }], # os_posix==1 and OS!="mac" and OS!="ios"
|
| + ['OS=="mac"', {
|
| + 'icu_use_data_file_flag%': 1,
|
| + }], # os=="mac"
|
| ['OS=="ios"', {
|
| 'disable_nacl%': 1,
|
| 'enable_background%': 0,
|
| @@ -2220,17 +2223,6 @@
|
| ['use_udev==1', {
|
| 'defines': ['USE_UDEV'],
|
| }],
|
| - ['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'],
|
| - }],
|
| - ],
|
| - }],
|
| ['fastbuild!=0', {
|
| 'xcode_settings': {
|
| 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO',
|
|
|