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

Side by Side Diff: icu.gyp

Issue 1646623006: Fix compilation errors on Android and Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 4 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/vscomp.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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 }], 239 }],
240 [ 'OS == "win" and clang==1', { 240 [ 'OS == "win" and clang==1', {
241 # Note: General clang warnings should go in the 241 # Note: General clang warnings should go in the
242 # clang_warning_flags block above. 242 # clang_warning_flags block above.
243 'msvs_settings': { 243 'msvs_settings': {
244 'VCCLCompilerTool': { 244 'VCCLCompilerTool': {
245 'AdditionalOptions': [ 245 'AdditionalOptions': [
246 # See http://bugs.icu-project.org/trac/ticket/11122 246 # See http://bugs.icu-project.org/trac/ticket/11122
247 '-Wno-inline-new-delete', 247 '-Wno-inline-new-delete',
248 '-Wno-implicit-exception-spec-mismatch', 248 '-Wno-implicit-exception-spec-mismatch',
249 # See http://bugs.icu-project.org/trac/ticket/11757.
250 '-Wno-reorder',
251 ], 249 ],
252 }, 250 },
253 }, 251 },
254 }], 252 }],
255 ], # conditions 253 ], # conditions
256 }, 254 },
257 { 255 {
258 'target_name': 'icuuc', 256 'target_name': 'icuuc',
259 'type': '<(component)', 257 'type': '<(component)',
260 'sources': [ 258 'sources': [
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 }, 597 },
600 'includes': [ 598 'includes': [
601 '../../build/shim_headers.gypi', 599 '../../build/shim_headers.gypi',
602 ], 600 ],
603 'toolsets': ['target'], 601 'toolsets': ['target'],
604 }, 602 },
605 ], # targets 603 ], # targets
606 }], 604 }],
607 ], # conditions 605 ], # conditions
608 } 606 }
OLDNEW
« no previous file with comments | « README.chromium ('k') | patches/vscomp.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698