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

Side by Side Diff: third_party/mesa/mesa.gyp

Issue 14860010: Android: Roll android_tools to b12d410c0ee23385da78e6c9f353d28fd992e0bd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Not adding fno-builtin-sin for clang builds 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 | « DEPS ('k') | 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 'conditions': [ 6 'conditions': [
7 ['use_system_mesa==0', { 7 ['use_system_mesa==0', {
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['OS!="win"', { 10 ['OS!="win"', {
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 ], 550 ],
551 }, 551 },
552 'cflags': [ 552 'cflags': [
553 '-Wno-unused-value', 553 '-Wno-unused-value',
554 '-Wno-constant-conversion', 554 '-Wno-constant-conversion',
555 ], 555 ],
556 'cflags!': [ 556 'cflags!': [
557 '-Wstring-conversion', 557 '-Wstring-conversion',
558 ], 558 ],
559 }], 559 }],
560 ['OS=="android" and clang==0', {
561 # Disable sincos() optimization to avoid a linker error
562 # since Android's math library doesn't have sincos().
563 # Either -fno-builtin-sin or -fno-builtin-cos works.
564 'cflags': [
565 '-fno-builtin-sin',
566 ],
567 }],
560 ], 568 ],
561 }, 569 },
562 # Building this target will hide the native OpenGL shared library and 570 # Building this target will hide the native OpenGL shared library and
563 # replace it with a slow software renderer. 571 # replace it with a slow software renderer.
564 { 572 {
565 'target_name': 'osmesa', 573 'target_name': 'osmesa',
566 'type': 'loadable_module', 574 'type': 'loadable_module',
567 'mac_bundle': 0, 575 'mac_bundle': 0,
568 'dependencies': [ 576 'dependencies': [
569 'mesa_headers', 577 'mesa_headers',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 'type': 'none', 643 'type': 'none',
636 }, 644 },
637 { 645 {
638 'target_name': 'osmesa', 646 'target_name': 'osmesa',
639 'type': 'none', 647 'type': 'none',
640 }, 648 },
641 ], 649 ],
642 }], 650 }],
643 ], 651 ],
644 } 652 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698