| Index: build/all.gyp
|
| diff --git a/build/all.gyp b/build/all.gyp
|
| index 95d92562ca36fa8c338e9122fcc8b8aaf146a42f..46d59d9edfb4831cedcf94d7e16d653aea5df36b 100644
|
| --- a/build/all.gyp
|
| +++ b/build/all.gyp
|
| @@ -30,6 +30,7 @@
|
| '../sql/sql.gyp:*',
|
| '../testing/gmock.gyp:*',
|
| '../testing/gtest.gyp:*',
|
| + '../third_party/boringssl/boringssl.gyp:*',
|
| '../third_party/icu/icu.gyp:*',
|
| '../third_party/libxml/libxml.gyp:*',
|
| '../third_party/sqlite/sqlite.gyp:*',
|
| @@ -167,11 +168,6 @@
|
| '<(libjpeg_gyp_path):*',
|
| ],
|
| }],
|
| - ['use_openssl==0 and OS=="ios"', {
|
| - 'dependencies': [
|
| - '../third_party/nss/nss.gyp:*',
|
| - ],
|
| - }],
|
| ['OS=="win" or OS=="ios" or OS=="linux"', {
|
| 'dependencies': [
|
| '../breakpad/breakpad.gyp:*',
|
| @@ -254,17 +250,7 @@
|
| '../remoting/remoting_all.gyp:remoting_all',
|
| ],
|
| }],
|
| - ['use_openssl==0', {
|
| - 'dependencies': [
|
| - '../net/third_party/nss/ssl.gyp:*',
|
| - ],
|
| - }],
|
| - ['use_openssl==1', {
|
| - 'dependencies': [
|
| - '../third_party/boringssl/boringssl.gyp:*',
|
| - ],
|
| - }],
|
| - ['use_openssl==1 and OS!="ios"', {
|
| + ['OS!="ios"', {
|
| 'dependencies': [
|
| '../third_party/boringssl/boringssl_tests.gyp:*',
|
| ],
|
|
|