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

Side by Side Diff: icu.gyp

Issue 14759026: Android: Disable 'sincos' optimization to avoid 'icu' link errors. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/icu46
Patch Set: Created 7 years, 7 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 'variables': { 6 'variables': {
7 'use_system_icu%': 0, 7 'use_system_icu%': 0,
8 'icu_use_data_file_flag%': 0, 8 'icu_use_data_file_flag%': 0,
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 ], 312 ],
313 }, 313 },
314 'cflags': [ 314 'cflags': [
315 '-Wno-deprecated-declarations', 315 '-Wno-deprecated-declarations',
316 '-Wno-logical-op-parentheses', 316 '-Wno-logical-op-parentheses',
317 '-Wno-tautological-compare', 317 '-Wno-tautological-compare',
318 '-Wno-header-hygiene', 318 '-Wno-header-hygiene',
319 '-Wno-return-type-c-linkage', 319 '-Wno-return-type-c-linkage',
320 ], 320 ],
321 }], 321 }],
322 ['OS == "android" and clang==0', {
323 # Disable sincos() optimization to avoid a linker error since
324 # Android's math library doesn't have sincos(). Either
325 # -fno-builtin-sin or -fno-builtin-cos works.
326 'cflags': [
327 '-fno-builtin-sin',
328 ],
329 }],
322 ['OS == "android" and use_system_stlport == 1', { 330 ['OS == "android" and use_system_stlport == 1', {
323 # ICU requires RTTI, which is not present in the system's stlport, 331 # ICU requires RTTI, which is not present in the system's stlport,
324 # so we have to include gabi++. 332 # so we have to include gabi++.
325 'include_dirs': [ 333 'include_dirs': [
326 '<(android_src)/abi/cpp/include', 334 '<(android_src)/abi/cpp/include',
327 ], 335 ],
328 'link_settings': { 336 'link_settings': {
329 'libraries': [ 337 'libraries': [
330 '-lgabi++', 338 '-lgabi++',
331 ], 339 ],
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 ], 815 ],
808 }, 816 },
809 'includes': [ 817 'includes': [
810 '../../build/shim_headers.gypi', 818 '../../build/shim_headers.gypi',
811 ], 819 ],
812 }, 820 },
813 ], 821 ],
814 }], 822 }],
815 ], 823 ],
816 } 824 }
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