| Index: build/linux/system.gyp
|
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp
|
| index add4fcadc279c60c955b584e7a38bb0a620f8f0c..bfef936e1f443c5761a037808de3d27909b3fe89 100644
|
| --- a/build/linux/system.gyp
|
| +++ b/build/linux/system.gyp
|
| @@ -18,17 +18,6 @@
|
| 'linux_link_libbrlapi%': 0,
|
| },
|
| 'conditions': [
|
| - [ 'os_posix==1 and OS!="mac"', {
|
| - 'variables': {
|
| - # We use our own copy of libssl3, although we still need to link against
|
| - # the rest of NSS.
|
| - 'use_system_ssl%': 0,
|
| - },
|
| - }, {
|
| - 'variables': {
|
| - 'use_system_ssl%': 1,
|
| - },
|
| - }],
|
| [ 'chromeos==0', {
|
| # Hide GTK and related dependencies for Chrome OS, so they won't get
|
| # added back to Chrome OS. Don't try to use GTK on Chrome OS.
|
| @@ -713,7 +702,7 @@
|
| '../../third_party/openssl/openssl.gyp:openssl',
|
| ],
|
| }],
|
| - ['use_openssl==0 and use_system_ssl==0', {
|
| + ['use_openssl==0', {
|
| 'dependencies': [
|
| '../../net/third_party/nss/ssl.gyp:libssl',
|
| ],
|
| @@ -736,24 +725,6 @@
|
| ],
|
| },
|
| }],
|
| - ['use_openssl==0 and use_system_ssl==1', {
|
| - 'direct_dependent_settings': {
|
| - 'cflags': [
|
| - '<!@(<(pkg-config) --cflags nss)',
|
| - ],
|
| - 'defines': [
|
| - 'USE_SYSTEM_SSL',
|
| - ],
|
| - },
|
| - 'link_settings': {
|
| - 'ldflags': [
|
| - '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
|
| - ],
|
| - 'libraries': [
|
| - '<!@(<(pkg-config) --libs-only-l nss)',
|
| - ],
|
| - },
|
| - }],
|
| ['use_openssl==0 and clang==1', {
|
| 'direct_dependent_settings': {
|
| 'cflags': [
|
|
|