| Index: chrome/chrome_common.gypi
|
| diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
|
| index 2f7ccad6833297c1539b5e51bee47c3f8ae32f4e..7faa5e66468118749f6ae5a27a51e760611b6785 100644
|
| --- a/chrome/chrome_common.gypi
|
| +++ b/chrome/chrome_common.gypi
|
| @@ -634,43 +634,31 @@
|
| }, { # OS == ios
|
| 'sources!': [
|
| 'common/net/net_resource_provider.cc',
|
| + ],
|
| + }],
|
| + ['OS == "android" or OS == "ios"', {
|
| + 'sources!': [
|
| 'common/net/x509_certificate_model.cc',
|
| ],
|
| }],
|
| - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
|
| + ['use_openssl_certs == 1 and OS != "android"', {
|
| 'dependencies': [
|
| - '../build/linux/system.gyp:ssl',
|
| + '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
|
| ],
|
| - },
|
| - ],
|
| - ['os_posix != 1 or OS == "mac" or OS == "ios"', {
|
| + }, {
|
| 'sources!': [
|
| - 'common/net/x509_certificate_model_nss.cc',
|
| 'common/net/x509_certificate_model_openssl.cc',
|
| ],
|
| },
|
| ],
|
| - ['OS == "android"', {
|
| + ['use_nss_certs == 1', {
|
| 'dependencies': [
|
| - '../third_party/boringssl/boringssl.gyp:boringssl',
|
| - ],
|
| - 'sources!': [
|
| - 'common/net/x509_certificate_model.cc',
|
| - 'common/net/x509_certificate_model_openssl.cc',
|
| + '../build/linux/system.gyp:ssl',
|
| ],
|
| - }],
|
| - ['use_openssl==1', {
|
| + }, {
|
| 'sources!': [
|
| 'common/net/x509_certificate_model_nss.cc',
|
| ],
|
| - 'dependencies': [
|
| - '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
|
| - ],
|
| - },
|
| - { # else !use_openssl: remove the unneeded files
|
| - 'sources!': [
|
| - 'common/net/x509_certificate_model_openssl.cc',
|
| - ],
|
| },
|
| ],
|
| ['OS=="win"', {
|
|
|