| Index: chrome/chrome_utility.gypi
|
| diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi
|
| index d986e14b44bc13baedd98ece6e0d36fc80ac6997..a0d134f350c65af471aeb2085ec8aafb46e0a41a 100644
|
| --- a/chrome/chrome_utility.gypi
|
| +++ b/chrome/chrome_utility.gypi
|
| @@ -120,12 +120,12 @@
|
| '<@(chrome_utility_sources)',
|
| ],
|
| 'conditions': [
|
| - ['OS!="win" and OS!="mac" and use_openssl==1', {
|
| - 'sources!': [
|
| - 'utility/importer/nss_decryptor.cc',
|
| - ]
|
| + ['OS!="android"', {
|
| + 'sources': [
|
| + '<@(chrome_utility_importer_sources)',
|
| + ],
|
| }],
|
| - ['OS!="win" and OS!="mac" and use_openssl==0', {
|
| + ['use_nss==1', {
|
| 'dependencies': [
|
| '../crypto/crypto.gyp:crypto',
|
| ],
|
| @@ -134,11 +134,6 @@
|
| 'utility/importer/nss_decryptor_system_nss.h',
|
| ],
|
| }],
|
| - ['OS!="android"', {
|
| - 'sources': [
|
| - '<@(chrome_utility_importer_sources)',
|
| - ],
|
| - }],
|
| ['enable_extensions==1', {
|
| 'dependencies': [
|
| '../extensions/extensions.gyp:extensions_utility',
|
|
|