| 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 ['cld_version==0 or cld_version==1', { | 259 ['cld_version==1', { |
| 260 'dependencies': [ | 260 'dependencies': [ |
| 261 '../third_party/cld/cld.gyp:cld', | 261 '<(DEPTH)/third_party/cld/cld.gyp:cld', |
| 262 ], | 262 ], |
| 263 }], | 263 }], |
| 264 ['cld_version==0 or cld_version==2', { | 264 ['cld_version==0 or cld_version==2', { |
| 265 'dependencies': [ | 265 'dependencies': [ |
| 266 '../third_party/cld_2/cld_2.gyp:cld_2', | 266 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', |
| 267 ], | 267 ], |
| 268 }], | 268 }], |
| 269 ['OS=="mac" and component!="shared_library"', { | 269 ['OS=="mac" and component!="shared_library"', { |
| 270 'includes': [ 'chrome_dll_bundle.gypi' ], | 270 'includes': [ 'chrome_dll_bundle.gypi' ], |
| 271 }], | 271 }], |
| 272 ['OS=="mac" and component=="shared_library"', { | 272 ['OS=="mac" and component=="shared_library"', { |
| 273 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, | 273 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, |
| 274 }], | 274 }], |
| 275 ['OS=="mac"', { | 275 ['OS=="mac"', { |
| 276 'xcode_settings': { | 276 'xcode_settings': { |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 }, | 371 }, |
| 372 }], | 372 }], |
| 373 ] | 373 ] |
| 374 }], | 374 }], |
| 375 ], | 375 ], |
| 376 }, # target chrome_child_dll | 376 }, # target chrome_child_dll |
| 377 ], | 377 ], |
| 378 }], | 378 }], |
| 379 ], | 379 ], |
| 380 } | 380 } |
| OLD | NEW |