| OLD | NEW |
| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'skia', | 8 'target_name': 'skia', |
| 9 'type': '<(component)', | 9 'type': '<(component)', |
| 10 'variables': { | 10 'variables': { |
| (...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 'dependencies': [ | 532 'dependencies': [ |
| 533 '../base/base.gyp:base', | 533 '../base/base.gyp:base', |
| 534 ], | 534 ], |
| 535 'direct_dependent_settings': { | 535 'direct_dependent_settings': { |
| 536 'defines': [ | 536 'defines': [ |
| 537 'GR_DLL', | 537 'GR_DLL', |
| 538 'SKIA_DLL', | 538 'SKIA_DLL', |
| 539 ], | 539 ], |
| 540 }, | 540 }, |
| 541 }], | 541 }], |
| 542 # TODO(scottmg): http://crbug.com/177306 |
| 543 ['clang==1', { |
| 544 'xcode_settings': { |
| 545 'WARNING_CFLAGS!': [ |
| 546 # Don't warn about string->bool used in asserts. |
| 547 '-Wstring-conversion', |
| 548 ], |
| 549 }, |
| 550 'cflags!': [ |
| 551 '-Wstring-conversion', |
| 552 ], |
| 553 }], |
| 542 ], | 554 ], |
| 543 'dependencies': [ | 555 'dependencies': [ |
| 544 'skia_opts', | 556 'skia_opts', |
| 545 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 557 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 546 '../third_party/sfntly/sfntly.gyp:sfntly', | 558 '../third_party/sfntly/sfntly.gyp:sfntly', |
| 547 '../third_party/zlib/zlib.gyp:zlib', | 559 '../third_party/zlib/zlib.gyp:zlib', |
| 548 ], | 560 ], |
| 549 'direct_dependent_settings': { | 561 'direct_dependent_settings': { |
| 550 'include_dirs': [ | 562 'include_dirs': [ |
| 551 'config', | 563 'config', |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 'sources': [ | 849 'sources': [ |
| 838 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', | 850 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', |
| 839 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', | 851 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', |
| 840 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', | 852 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', |
| 841 ], | 853 ], |
| 842 }, | 854 }, |
| 843 ], | 855 ], |
| 844 }], | 856 }], |
| 845 ], | 857 ], |
| 846 } | 858 } |
| OLD | NEW |