| 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 'conditions': [ | 5 'conditions': [ |
| 6 ['OS=="mac" or OS=="win"', { | 6 ['OS=="mac" or OS=="win"', { |
| 7 'targets': [ | 7 'targets': [ |
| 8 { | 8 { |
| 9 'target_name': 'chrome_dll', | 9 'target_name': 'chrome_dll', |
| 10 'type': 'none', | 10 'type': 'none', |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 ], | 249 ], |
| 250 }, { | 250 }, { |
| 251 'dependencies': [ | 251 'dependencies': [ |
| 252 '<@(chromium_child_dependencies)', | 252 '<@(chromium_child_dependencies)', |
| 253 '../content/content.gyp:content_app_both', | 253 '../content/content.gyp:content_app_both', |
| 254 ], | 254 ], |
| 255 'dependencies!': [ | 255 'dependencies!': [ |
| 256 '../content/content.gyp:content_app_browser', | 256 '../content/content.gyp:content_app_browser', |
| 257 ], | 257 ], |
| 258 }], | 258 }], |
| 259 ['chrome_multiple_dll==0 and enable_plugins==1', { |
| 260 'dependencies': [ |
| 261 '../pdf/pdf.gyp:pdf', |
| 262 ], |
| 263 }], |
| 259 ['cld_version==1', { | 264 ['cld_version==1', { |
| 260 'dependencies': [ | 265 'dependencies': [ |
| 261 '<(DEPTH)/third_party/cld/cld.gyp:cld', | 266 '<(DEPTH)/third_party/cld/cld.gyp:cld', |
| 262 ], | 267 ], |
| 263 }], | 268 }], |
| 264 ['cld_version==0 or cld_version==2', { | 269 ['cld_version==0 or cld_version==2', { |
| 265 'dependencies': [ | 270 'dependencies': [ |
| 266 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', | 271 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', |
| 267 ], | 272 ], |
| 268 }], | 273 }], |
| 269 ['OS=="mac" and component!="shared_library"', { | 274 ['OS=="mac" and component!="shared_library"', { |
| 270 'includes': [ 'chrome_dll_bundle.gypi' ], | 275 'includes': [ 'chrome_dll_bundle.gypi' ], |
| 271 }], | 276 }], |
| 272 ['OS=="mac" and component=="shared_library"', { | 277 ['OS=="mac" and component=="shared_library"', { |
| 273 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, | 278 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, |
| 274 }], | 279 }], |
| 275 ['OS=="mac"', { | 280 ['OS=="mac"', { |
| 276 'xcode_settings': { | 281 'xcode_settings': { |
| 277 # Define the order of symbols within the framework. This | 282 # Define the order of symbols within the framework. This |
| 278 # sets -order_file. | 283 # sets -order_file. |
| 279 'ORDER_FILE': 'app/framework.order', | 284 'ORDER_FILE': 'app/framework.order', |
| 280 }, | 285 }, |
| 281 'dependencies': [ | |
| 282 '../pdf/pdf.gyp:pdf', | |
| 283 ], | |
| 284 'include_dirs': [ | 286 'include_dirs': [ |
| 285 '<(grit_out_dir)', | 287 '<(grit_out_dir)', |
| 286 ], | 288 ], |
| 287 'postbuilds': [ | 289 'postbuilds': [ |
| 288 { | 290 { |
| 289 # This step causes an error to be raised if the .order file | 291 # This step causes an error to be raised if the .order file |
| 290 # does not account for all global text symbols. It | 292 # does not account for all global text symbols. It |
| 291 # validates the completeness of the .order file. | 293 # validates the completeness of the .order file. |
| 292 'postbuild_name': 'Verify global text symbol order', | 294 'postbuild_name': 'Verify global text symbol order', |
| 293 'variables': { | 295 'variables': { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 }], | 367 }], |
| 366 ['chrome_pgo_phase==2', { | 368 ['chrome_pgo_phase==2', { |
| 367 'msvs_settings': { | 369 'msvs_settings': { |
| 368 'VCLinkerTool': { | 370 'VCLinkerTool': { |
| 369 'LinkTimeCodeGeneration': '3', | 371 'LinkTimeCodeGeneration': '3', |
| 370 }, | 372 }, |
| 371 }, | 373 }, |
| 372 }], | 374 }], |
| 373 ] | 375 ] |
| 374 }], | 376 }], |
| 377 ['enable_plugins==1', { |
| 378 'dependencies': [ |
| 379 '../pdf/pdf.gyp:pdf', |
| 380 ], |
| 381 }], |
| 375 ], | 382 ], |
| 376 }, # target chrome_child_dll | 383 }, # target chrome_child_dll |
| 377 ], | 384 ], |
| 378 }], | 385 }], |
| 379 ], | 386 ], |
| 380 } | 387 } |
| OLD | NEW |