| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, # Use higher warning level. | 7 'chromium_code': 1, # Use higher warning level. |
| 8 }, | 8 }, |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 ], | 78 ], |
| 79 }, { | 79 }, { |
| 80 'dependencies': [ | 80 'dependencies': [ |
| 81 '../third_party/WebKit/public/blink.gyp:blink', | 81 '../third_party/WebKit/public/blink.gyp:blink', |
| 82 ], | 82 ], |
| 83 'export_dependent_settings': [ | 83 'export_dependent_settings': [ |
| 84 '../third_party/WebKit/public/blink.gyp:blink', | 84 '../third_party/WebKit/public/blink.gyp:blink', |
| 85 ], | 85 ], |
| 86 }], | 86 }], |
| 87 ], | 87 ], |
| 88 # Disable c4267 warnings until we fix size_t to int truncations. | |
| 89 'msvs_disabled_warnings': [ 4267, ], | |
| 90 }, | 88 }, |
| 91 ], | 89 ], |
| 92 'conditions': [ | 90 'conditions': [ |
| 93 ['component=="static_library"', { | 91 ['component=="static_library"', { |
| 94 # In a static build, build ppapi_ipc separately. | 92 # In a static build, build ppapi_ipc separately. |
| 95 'targets': [ | 93 'targets': [ |
| 96 { | 94 { |
| 97 # GN version: //ppapi:ppapi_ipc | 95 # GN version: //ppapi:ppapi_ipc |
| 98 'target_name': 'ppapi_ipc', | 96 'target_name': 'ppapi_ipc', |
| 99 'type': 'static_library', | 97 'type': 'static_library', |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 '../ui/surface/surface.gyp:surface', | 135 '../ui/surface/surface.gyp:surface', |
| 138 'ppapi.gyp:ppapi_c', | 136 'ppapi.gyp:ppapi_c', |
| 139 'ppapi_shared', | 137 'ppapi_shared', |
| 140 'ppapi_ipc', | 138 'ppapi_ipc', |
| 141 ], | 139 ], |
| 142 'all_dependent_settings': { | 140 'all_dependent_settings': { |
| 143 'include_dirs': [ | 141 'include_dirs': [ |
| 144 '..', | 142 '..', |
| 145 ], | 143 ], |
| 146 }, | 144 }, |
| 147 # Disable c4267 warnings until we fix size_t to int truncations. | |
| 148 'msvs_disabled_warnings': [ 4267, ], | |
| 149 'conditions': [ | 145 'conditions': [ |
| 150 ['chrome_multiple_dll==1', { | 146 ['chrome_multiple_dll==1', { |
| 151 'dependencies': [ | 147 'dependencies': [ |
| 152 '../third_party/WebKit/public/blink.gyp:blink_minimal', | 148 '../third_party/WebKit/public/blink.gyp:blink_minimal', |
| 153 ], | 149 ], |
| 154 }, { | 150 }, { |
| 155 'dependencies': [ | 151 'dependencies': [ |
| 156 '../third_party/WebKit/public/blink.gyp:blink', | 152 '../third_party/WebKit/public/blink.gyp:blink', |
| 157 ], | 153 ], |
| 158 }], | 154 }], |
| (...skipping 29 matching lines...) Expand all Loading... |
| 188 '../ui/events/ipc/events_ipc.gyp:events_ipc', | 184 '../ui/events/ipc/events_ipc.gyp:events_ipc', |
| 189 '../ui/surface/surface.gyp:surface', | 185 '../ui/surface/surface.gyp:surface', |
| 190 'ppapi.gyp:ppapi_c', | 186 'ppapi.gyp:ppapi_c', |
| 191 'ppapi_shared', | 187 'ppapi_shared', |
| 192 ], | 188 ], |
| 193 'all_dependent_settings': { | 189 'all_dependent_settings': { |
| 194 'include_dirs': [ | 190 'include_dirs': [ |
| 195 '..', | 191 '..', |
| 196 ], | 192 ], |
| 197 }, | 193 }, |
| 198 # Disable c4267 warnings until we fix size_t to int truncations. | |
| 199 'msvs_disabled_warnings': [ 4267, ], | |
| 200 'conditions': [ | 194 'conditions': [ |
| 201 ['chrome_multiple_dll==1', { | 195 ['chrome_multiple_dll==1', { |
| 202 'dependencies': [ | 196 'dependencies': [ |
| 203 '../third_party/WebKit/public/blink.gyp:blink_minimal', | 197 '../third_party/WebKit/public/blink.gyp:blink_minimal', |
| 204 ], | 198 ], |
| 205 }, { | 199 }, { |
| 206 'dependencies': [ | 200 'dependencies': [ |
| 207 '../third_party/WebKit/public/blink.gyp:blink', | 201 '../third_party/WebKit/public/blink.gyp:blink', |
| 208 ], | 202 ], |
| 209 }], | 203 }], |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 }, | 279 }, |
| 286 'configurations': { | 280 'configurations': { |
| 287 'Common_Base': { | 281 'Common_Base': { |
| 288 'msvs_target_platform': 'x64', | 282 'msvs_target_platform': 'x64', |
| 289 }, | 283 }, |
| 290 }, | 284 }, |
| 291 }], | 285 }], |
| 292 }], | 286 }], |
| 293 ], | 287 ], |
| 294 } | 288 } |
| OLD | NEW |