Move the logic for getting icu data out of icu_util
Currently, how to build/link the icu data is split between common.gypi and icu_util.cc Move it out of icu_util.cc and put it in common.gypi Also, remove icudata from the dependency list in url.gyp. icuuc depends on icudata and specifying icuuc alone is sufficient. Otherwise, ninja complains about multiple rules specified for icudata and a circular dependency when icu_use_data_file_flag is set to 1 on Linux. A similar change has to be made in third_party/WebKit/Source/web/web.gyp. (see https://codereview.chromium.org/93053003/ ) This CL does not change the actual build process, yet. It's just to prepare to switch to "icu*.dat" on Mac and Linux. BUG=72633 TEST=All the configuration/builds go fine on all platforms. Review URL: https://codereview.chromium.org/89863002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@238567 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
d764644c44
Коммит
c1a52c1465
15
common.gypi
15
common.gypi
|
@ -1212,6 +1212,10 @@
|
|||
# IPC fuzzer is disabled by default.
|
||||
'enable_ipc_fuzzer%': 0,
|
||||
|
||||
# Whether or not to use "icu*.dat" file for ICU data.
|
||||
# Do not use it by default.
|
||||
'icu_use_data_file_flag%': 0,
|
||||
|
||||
'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
|
||||
|
@ -2152,6 +2156,17 @@
|
|||
['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',
|
||||
|
|
Загрузка…
Ссылка в новой задаче