Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: build/linux/system.gyp

Issue 1918303002: Renaming system.gyp:ssl to system.gyp:nss and removing unused BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/secondary/third_party/nss/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 553a5a7030090cd8f4eac55a5fd98ba0acb78be5..084c6a435079266ee2c78962588c577cc2165482 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -1242,45 +1242,38 @@
],
},
{
- 'target_name': 'ssl',
+ 'target_name': 'nss',
'type': 'none',
'conditions': [
- ['_toolset=="target"', {
- 'dependencies': [
- '../../third_party/boringssl/boringssl.gyp:boringssl',
- ],
+ # Link in the system NSS if it is used for the platform certificate
+ # library (use_nss_certs==1).
+ ['_toolset=="target" and use_nss_certs==1', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags nss)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
+ ],
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
+ ],
+ },
'conditions': [
- # Link in the system NSS if it is used for the platform certificate
- # library (use_nss_certs==1).
- ['use_nss_certs==1', {
+ ['clang==1', {
'direct_dependent_settings': {
'cflags': [
- '<!@(<(pkg-config) --cflags nss)',
+ # There is a broken header guard in /usr/include/nss/secmod.h:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
+ '-Wno-header-guard',
],
},
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
- ],
- },
- 'conditions': [
- ['clang==1', {
- 'direct_dependent_settings': {
- 'cflags': [
- # There is a broken header guard in /usr/include/nss/secmod.h:
- # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
- '-Wno-header-guard',
- ],
- },
- }],
- ],
}],
- ]
+ ],
}],
- ],
+ ]
},
{
'target_name': 'libffi',
« no previous file with comments | « no previous file | build/secondary/third_party/nss/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698