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

Side by Side Diff: icu.gyp

Issue 926113004: Move stubdata.c from icudata to icuuc (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « README.chromium ('k') | patches/data_symb.patch » ('j') | 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 { 128 {
129 'destination': '<(PRODUCT_DIR)', 129 'destination': '<(PRODUCT_DIR)',
130 'files': [ 130 'files': [
131 'windows/icudt.dll', 131 'windows/icudt.dll',
132 ], 132 ],
133 }, 133 },
134 ], 134 ],
135 }], 135 }],
136 [ 'icu_use_data_file_flag==1', { 136 [ 'icu_use_data_file_flag==1', {
137 # Remove any assembly data file. 137 # Remove any assembly data file.
138 'sources/': [['exclude', 'icudtl_dat']], 138 'sources/': [['exclude', 'icudtl_dat']],
jungshik at Google 2015/02/14 15:16:56 To prevent libicudata.a or its Win-equivalent (tha
139 # Compile in the stub data symbol.
140 'sources': ['source/stubdata/stubdata.c'],
141 139
142 # Make sure any binary depending on this gets the data file. 140 # Make sure any binary depending on this gets the data file.
143 'conditions': [ 141 'conditions': [
144 ['OS != "ios"', { 142 ['OS != "ios"', {
145 'dependencies': [ 143 'dependencies': [
146 'copy_icudtl_dat#host', 144 'copy_icudtl_dat#host',
147 ], 145 ],
148 } , { # else: OS=="ios" 146 } , { # else: OS=="ios"
149 'link_settings': { 147 'link_settings': {
150 'mac_bundle_resources': [ 148 'mac_bundle_resources': [
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 'conditions': [ 316 'conditions': [
319 [ 'use_system_icu==1 and want_separate_host_toolset==1', { 317 [ 'use_system_icu==1 and want_separate_host_toolset==1', {
320 'toolsets': ['host'], 318 'toolsets': ['host'],
321 }], 319 }],
322 [ 'use_system_icu==0 and want_separate_host_toolset==1', { 320 [ 'use_system_icu==0 and want_separate_host_toolset==1', {
323 'toolsets': ['host', 'target'], 321 'toolsets': ['host', 'target'],
324 }], 322 }],
325 [ 'use_system_icu==0 and want_separate_host_toolset==0', { 323 [ 'use_system_icu==0 and want_separate_host_toolset==0', {
326 'toolsets': ['target'], 324 'toolsets': ['target'],
327 }], 325 }],
328 [ 'OS == "win" and icu_use_data_file_flag==0', { 326 [ 'OS == "win" or icu_use_data_file_flag==1', {
329 'sources': [ 327 'sources': [
330 'source/stubdata/stubdata.c', 328 'source/stubdata/stubdata.c',
331 ], 329 ],
330 'defines': [
331 'U_ICUDATAENTRY_IN_COMMON',
332 ],
332 }], 333 }],
333 [ 'OS == "win" and clang==1', { 334 [ 'OS == "win" and clang==1', {
334 # Note: General clang warnings should go in the 335 # Note: General clang warnings should go in the
335 # clang_warning_flags block above. 336 # clang_warning_flags block above.
336 'msvs_settings': { 337 'msvs_settings': {
337 'VCCLCompilerTool': { 338 'VCCLCompilerTool': {
338 'AdditionalOptions': [ 339 'AdditionalOptions': [
339 # See http://bugs.icu-project.org/trac/ticket/11122 340 # See http://bugs.icu-project.org/trac/ticket/11122
340 '-Wno-inline-new-delete', 341 '-Wno-inline-new-delete',
341 '-Wno-implicit-exception-spec-mismatch', 342 '-Wno-implicit-exception-spec-mismatch',
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 }, 581 },
581 'includes': [ 582 'includes': [
582 '../../build/shim_headers.gypi', 583 '../../build/shim_headers.gypi',
583 ], 584 ],
584 'toolsets': ['target'], 585 'toolsets': ['target'],
585 }, 586 },
586 ], # targets 587 ], # targets
587 }], 588 }],
588 ], # conditions 589 ], # conditions
589 } 590 }
OLDNEW
« no previous file with comments | « README.chromium ('k') | patches/data_symb.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698