| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 }, | 116 }, |
| 117 'VCLinkerTool': { | 117 'VCLinkerTool': { |
| 118 'GenerateDebugInformation': 'true', # /DEBUG | 118 'GenerateDebugInformation': 'true', # /DEBUG |
| 119 }, | 119 }, |
| 120 }, | 120 }, |
| 121 }, | 121 }, |
| 122 }, | 122 }, |
| 123 'conditions' : [ | 123 'conditions' : [ |
| 124 # Gyp's ninja generator depends on these specially named | 124 # Gyp's ninja generator depends on these specially named |
| 125 # configurations to build 64-bit on Windows. | 125 # configurations to build 64-bit on Windows. |
| 126 # See http://skbug.com/2348 | 126 # See https://bug.skia.org/2348 |
| 127 # | 127 # |
| 128 # We handle the 64- vs 32-bit variations elsewhere, so I think it's | 128 # We handle the 64- vs 32-bit variations elsewhere, so I think it's |
| 129 # OK for us to just make these inherit non-archwidth-specific | 129 # OK for us to just make these inherit non-archwidth-specific |
| 130 # configurations without modification. | 130 # configurations without modification. |
| 131 # | 131 # |
| 132 # See http://skbug.com/2442 : These targets cause problems in the | 132 # See https://bug.skia.org/2442 : These targets cause problems in the |
| 133 # MSVS build, so only include them if gyp is generating a ninja build. | 133 # MSVS build, so only include them if gyp is generating a ninja build. |
| 134 [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', { | 134 [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', { |
| 135 'configurations': { | 135 'configurations': { |
| 136 'Debug_x64': { | 136 'Debug_x64': { |
| 137 'inherit_from': ['Debug'], | 137 'inherit_from': ['Debug'], |
| 138 'msvs_settings': { | 138 'msvs_settings': { |
| 139 'VCCLCompilerTool': { | 139 'VCCLCompilerTool': { |
| 140 # /ZI is not supported on 64bit | 140 # /ZI is not supported on 64bit |
| 141 'DebugInformationFormat': '3', # programDatabase (/Zi) | 141 'DebugInformationFormat': '3', # programDatabase (/Zi) |
| 142 }, | 142 }, |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 [ 'skia_android_framework', { | 597 [ 'skia_android_framework', { |
| 598 'cflags!': [ | 598 'cflags!': [ |
| 599 '-fuse-ld=gold', | 599 '-fuse-ld=gold', |
| 600 '-mssse3', | 600 '-mssse3', |
| 601 ], | 601 ], |
| 602 }], | 602 }], |
| 603 [ 'skia_shared_lib', { | 603 [ 'skia_shared_lib', { |
| 604 'defines': [ | 604 'defines': [ |
| 605 'SKIA_DLL', | 605 'SKIA_DLL', |
| 606 'SKIA_IMPLEMENTATION=1', | 606 'SKIA_IMPLEMENTATION=1', |
| 607 # Needed until we fix skbug.com/2440. | 607 # Needed until we fix https://bug.skia.org/2440 . |
| 608 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | 608 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', |
| 609 ], | 609 ], |
| 610 }], | 610 }], |
| 611 [ 'skia_profile_enabled == 1', { | 611 [ 'skia_profile_enabled == 1', { |
| 612 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], | 612 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], |
| 613 }], | 613 }], |
| 614 ], | 614 ], |
| 615 }, | 615 }, |
| 616 ], | 616 ], |
| 617 | 617 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 632 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 632 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
| 633 }, | 633 }, |
| 634 }], | 634 }], |
| 635 | 635 |
| 636 ], # end 'conditions' | 636 ], # end 'conditions' |
| 637 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 637 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 638 'xcode_settings': { | 638 'xcode_settings': { |
| 639 'SYMROOT': '<(DEPTH)/xcodebuild', | 639 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 640 }, | 640 }, |
| 641 } | 641 } |
| OLD | NEW |