| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 'conditions': [ | 142 'conditions': [ |
| 143 ['chrome_multiple_dll==1', { | 143 ['chrome_multiple_dll==1', { |
| 144 'dependencies': [ | 144 'dependencies': [ |
| 145 '../third_party/WebKit/public/blink.gyp:blink_minimal', | 145 '../third_party/WebKit/public/blink.gyp:blink_minimal', |
| 146 ], | 146 ], |
| 147 }, { | 147 }, { |
| 148 'dependencies': [ | 148 'dependencies': [ |
| 149 '../third_party/WebKit/public/blink.gyp:blink', | 149 '../third_party/WebKit/public/blink.gyp:blink', |
| 150 ], | 150 ], |
| 151 }], | 151 }], |
| 152 ['OS=="linux"', { |
| 153 'dependencies': [ |
| 154 '../components/tracing.gyp:tracing', |
| 155 ], |
| 156 }], |
| 152 ], | 157 ], |
| 153 }, | 158 }, |
| 154 ], | 159 ], |
| 155 }, | 160 }, |
| 156 { # component != static_library | 161 { # component != static_library |
| 157 # In the component build, we'll just build ppapi_ipc in to ppapi_proxy. | 162 # In the component build, we'll just build ppapi_ipc in to ppapi_proxy. |
| 158 'targets': [ | 163 'targets': [ |
| 159 { | 164 { |
| 160 'target_name': 'ppapi_proxy', | 165 'target_name': 'ppapi_proxy', |
| 161 'type': 'shared_library', | 166 'type': 'shared_library', |
| (...skipping 27 matching lines...) Expand all Loading... |
| 189 'conditions': [ | 194 'conditions': [ |
| 190 ['chrome_multiple_dll==1', { | 195 ['chrome_multiple_dll==1', { |
| 191 'dependencies': [ | 196 'dependencies': [ |
| 192 '../third_party/WebKit/public/blink.gyp:blink_minimal', | 197 '../third_party/WebKit/public/blink.gyp:blink_minimal', |
| 193 ], | 198 ], |
| 194 }, { | 199 }, { |
| 195 'dependencies': [ | 200 'dependencies': [ |
| 196 '../third_party/WebKit/public/blink.gyp:blink', | 201 '../third_party/WebKit/public/blink.gyp:blink', |
| 197 ], | 202 ], |
| 198 }], | 203 }], |
| 204 ['OS=="linux"', { |
| 205 'dependencies': [ |
| 206 '../components/tracing.gyp:tracing', |
| 207 ], |
| 208 }], |
| 199 ], | 209 ], |
| 200 }, | 210 }, |
| 201 { | 211 { |
| 202 # In component build, this is just a phony target that makes sure | 212 # In component build, this is just a phony target that makes sure |
| 203 # ppapi_proxy is built, since that's where the ipc sources go in the | 213 # ppapi_proxy is built, since that's where the ipc sources go in the |
| 204 # component build. | 214 # component build. |
| 205 'target_name': 'ppapi_ipc', | 215 'target_name': 'ppapi_ipc', |
| 206 'type': 'none', | 216 'type': 'none', |
| 207 'dependencies': [ | 217 'dependencies': [ |
| 208 'ppapi_proxy', | 218 'ppapi_proxy', |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 }, | 277 }, |
| 268 'configurations': { | 278 'configurations': { |
| 269 'Common_Base': { | 279 'Common_Base': { |
| 270 'msvs_target_platform': 'x64', | 280 'msvs_target_platform': 'x64', |
| 271 }, | 281 }, |
| 272 }, | 282 }, |
| 273 }], | 283 }], |
| 274 }], | 284 }], |
| 275 ], | 285 ], |
| 276 } | 286 } |
| OLD | NEW |