| OLD | NEW |
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # conditions used in both common.gypi and skia.gyp in chromium | 6 # conditions used in both common.gypi and skia.gyp in chromium |
| 7 # | 7 # |
| 8 { | 8 { |
| 9 'defines': [ | 9 'defines': [ |
| 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 | 555 |
| 556 '-Wno-unused-parameter', | 556 '-Wno-unused-parameter', |
| 557 ], | 557 ], |
| 558 }, | 558 }, |
| 559 }, | 559 }, |
| 560 ], | 560 ], |
| 561 | 561 |
| 562 [ 'skia_os == "ios"', | 562 [ 'skia_os == "ios"', |
| 563 { | 563 { |
| 564 'defines': [ | 564 'defines': [ |
| 565 # When targetting iOS and using gyp to generate the build files, it is |
| 566 # not possible to select files to build depending on the architecture |
| 567 # (i.e. it is not possible to use hand optimized assembly version). In |
| 568 # that configuration, disable all optimisation. |
| 565 'SK_BUILD_FOR_IOS', | 569 'SK_BUILD_FOR_IOS', |
| 570 'SK_BUILD_NO_OPTS', |
| 566 ], | 571 ], |
| 567 'conditions' : [ | 572 'conditions' : [ |
| 568 [ 'skia_warnings_as_errors', { | 573 [ 'skia_warnings_as_errors', { |
| 569 'xcode_settings': { | 574 'xcode_settings': { |
| 570 'OTHER_CPLUSPLUSFLAGS': [ | 575 'OTHER_CPLUSPLUSFLAGS': [ |
| 571 '-Werror', | 576 '-Werror', |
| 572 ], | 577 ], |
| 573 }, | 578 }, |
| 574 }], | 579 }], |
| 575 ], | 580 ], |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 694 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
| 690 }, | 695 }, |
| 691 }], | 696 }], |
| 692 | 697 |
| 693 ], # end 'conditions' | 698 ], # end 'conditions' |
| 694 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 699 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 695 'xcode_settings': { | 700 'xcode_settings': { |
| 696 'SYMROOT': '<(DEPTH)/xcodebuild', | 701 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 697 }, | 702 }, |
| 698 } | 703 } |
| OLD | NEW |