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

Side by Side Diff: icu.gyp

Issue 486103002: Only add stubdata.c once on Windows (when icu_use_data_file_flag is set) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu52/
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 'icu.gypi', 7 'icu.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'use_system_icu%': 0, 10 'use_system_icu%': 0,
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 'conditions': [ 319 'conditions': [
320 [ 'use_system_icu==1 and want_separate_host_toolset==1', { 320 [ 'use_system_icu==1 and want_separate_host_toolset==1', {
321 'toolsets': ['host'], 321 'toolsets': ['host'],
322 }], 322 }],
323 [ 'use_system_icu==0 and want_separate_host_toolset==1', { 323 [ 'use_system_icu==0 and want_separate_host_toolset==1', {
324 'toolsets': ['host', 'target'], 324 'toolsets': ['host', 'target'],
325 }], 325 }],
326 [ 'use_system_icu==0 and want_separate_host_toolset==0', { 326 [ 'use_system_icu==0 and want_separate_host_toolset==0', {
327 'toolsets': ['target'], 327 'toolsets': ['target'],
328 }], 328 }],
329 [ 'OS == "win"', { 329 [ 'OS == "win" and icu_use_data_file_flag==0', {
scottmg 2014/08/19 04:02:30 it's added in icudata at line 138 when icu_use_dat
330 'sources': [ 330 'sources': [
331 'source/stubdata/stubdata.c', 331 'source/stubdata/stubdata.c',
332 ], 332 ],
333 }], 333 }],
334 ['OS == "android" and use_system_stlport == 1', { 334 ['OS == "android" and use_system_stlport == 1', {
335 'target_conditions': [ 335 'target_conditions': [
336 ['_toolset == "target"', { 336 ['_toolset == "target"', {
337 # ICU requires RTTI, which is not present in the system's 337 # ICU requires RTTI, which is not present in the system's
338 # stlport, so we have to include gabi++. 338 # stlport, so we have to include gabi++.
339 'include_dirs': [ 339 'include_dirs': [
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 }, 595 },
596 'includes': [ 596 'includes': [
597 '../../build/shim_headers.gypi', 597 '../../build/shim_headers.gypi',
598 ], 598 ],
599 'toolsets': ['target'], 599 'toolsets': ['target'],
600 }, 600 },
601 ], # targets 601 ], # targets
602 }], 602 }],
603 ], # conditions 603 ], # conditions
604 } 604 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698