| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'target_defaults': { | 6 'target_defaults': { |
| 7 'variables': { | 7 'variables': { |
| 8 'chrome_common_target': 0, | 8 'chrome_common_target': 0, |
| 9 }, | 9 }, |
| 10 'target_conditions': [ | 10 'target_conditions': [ |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 '../app/app.gyp:app_base', | 370 '../app/app.gyp:app_base', |
| 371 '../base/base.gyp:base', | 371 '../base/base.gyp:base', |
| 372 '../gpu/gpu.gyp:gpu_ipc', | 372 '../gpu/gpu.gyp:gpu_ipc', |
| 373 '../net/net.gyp:net_resources', | 373 '../net/net.gyp:net_resources', |
| 374 '../net/net.gyp:net', | 374 '../net/net.gyp:net', |
| 375 '../third_party/icu/icu.gyp:icui18n', | 375 '../third_party/icu/icu.gyp:icui18n', |
| 376 '../third_party/icu/icu.gyp:icuuc', | 376 '../third_party/icu/icu.gyp:icuuc', |
| 377 ], | 377 ], |
| 378 'conditions': [ | 378 'conditions': [ |
| 379 ['os_posix == 1 and OS != "mac"', { | 379 ['os_posix == 1 and OS != "mac"', { |
| 380 'conditions': [ | 380 'dependencies': [ |
| 381 ['use_openssl==1', { | 381 '../build/linux/system.gyp:ssl', |
| 382 'dependencies': [ | |
| 383 '../third_party/openssl/openssl.gyp:openssl', | |
| 384 ], | |
| 385 }, | |
| 386 { # else !use_openssl | |
| 387 'dependencies': [ | |
| 388 '../build/linux/system.gyp:nss', | |
| 389 ], | |
| 390 }, | |
| 391 ], | |
| 392 ], | 382 ], |
| 393 }, | 383 }, |
| 394 { # else: OS is not in the above list | 384 { # else: OS is not in the above list |
| 395 'sources!': [ | 385 'sources!': [ |
| 396 'common/net/x509_certificate_model_nss.cc', | 386 'common/net/x509_certificate_model_nss.cc', |
| 397 'common/net/x509_certificate_model_openssl.cc', | 387 'common/net/x509_certificate_model_openssl.cc', |
| 398 ], | 388 ], |
| 399 }, | 389 }, |
| 400 ], | 390 ], |
| 401 ['use_openssl==1', { | 391 ['use_openssl==1', { |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 'configurations': { | 513 'configurations': { |
| 524 'Common_Base': { | 514 'Common_Base': { |
| 525 'msvs_target_platform': 'x64', | 515 'msvs_target_platform': 'x64', |
| 526 }, | 516 }, |
| 527 }, | 517 }, |
| 528 }, | 518 }, |
| 529 ], | 519 ], |
| 530 }], | 520 }], |
| 531 ], | 521 ], |
| 532 } | 522 } |
| OLD | NEW |