| Index: chrome/chrome_utility.gypi
|
| diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
|
| index d076a1b933d618921d1650b040d9f5b03d27466c..08d58b24aa2ce3433f541722a08d7bd06be61af2 100644
|
| --- a/chrome/chrome_utility.gypi
|
| +++ b/chrome/chrome_utility.gypi
|
| @@ -133,26 +133,21 @@
|
| },
|
| },
|
| }],
|
| - ['OS!="win" and OS!="mac" and use_openssl==1', {
|
| - 'sources!': [
|
| - 'utility/importer/nss_decryptor.cc',
|
| - ]
|
| - }],
|
| - ['OS!="win" and OS!="mac" and use_openssl==0', {
|
| + ['OS!="android"', {
|
| 'dependencies': [
|
| - '../crypto/crypto.gyp:crypto',
|
| + '../net/net.gyp:net_utility_services',
|
| ],
|
| 'sources': [
|
| - 'utility/importer/nss_decryptor_system_nss.cc',
|
| - 'utility/importer/nss_decryptor_system_nss.h',
|
| + '<@(chrome_utility_importer_sources)',
|
| ],
|
| }],
|
| - ['OS!="android"', {
|
| + ['use_nss_certs==1', {
|
| 'dependencies': [
|
| - '../net/net.gyp:net_utility_services',
|
| + '../crypto/crypto.gyp:crypto',
|
| ],
|
| 'sources': [
|
| - '<@(chrome_utility_importer_sources)',
|
| + 'utility/importer/nss_decryptor_system_nss.cc',
|
| + 'utility/importer/nss_decryptor_system_nss.h',
|
| ],
|
| }],
|
| ['OS=="android" and use_seccomp_bpf==1', {
|
|
|