Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2691)

Unified Diff: build/common.gypi

Issue 109013004: Use icudat*.dat file on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move icudtl.dat copy to content_shell framework target Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gyp ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« no previous file with comments | « base/base.gyp ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698