build/common.gypi - Issue 109013004: Use icudat*.dat file on Mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: use PRODUCT_DIR instead of DEPTH Created 6 years, 12 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:

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 7b0320a97d56afa24aa3a17e0160723984eae8d1..f28d58ad3e5a6eb2999f4470117e4a94a9d20182 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -1296,6 +1296,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,

@@ -2209,17 +2212,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',