summaryrefslogtreecommitdiffstats
path: root/base/base.gypi
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 18:29:53 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 18:29:53 +0000
commita0b23d89112857c91aaa991465166a59993a15cf (patch)
treeed6dfeda48c3cba8b533dc9cec9bc21c97fb2463 /base/base.gypi
parent858ba41a265e6a03bb454209f635c79949616a0f (diff)
downloadchromium_src-a0b23d89112857c91aaa991465166a59993a15cf.zip
chromium_src-a0b23d89112857c91aaa991465166a59993a15cf.tar.gz
chromium_src-a0b23d89112857c91aaa991465166a59993a15cf.tar.bz2
Fix nss-specific settings in base.gypi
Since scoped_nss_types.h includes NSS headers, nss settings need to be exported by the base library. BUG= TEST= Review URL: http://codereview.chromium.org/6778021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
-rw-r--r--base/base.gypi6
1 files changed, 6 insertions, 0 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 3e0aa51..e4d10ff 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -451,9 +451,15 @@
'../third_party/openssl/openssl.gyp:openssl',
],
}, { # use_openssl==0
+ 'sources': [
+ 'base/crypto/scoped_nss_types.h',
+ ],
'dependencies': [
'../build/linux/system.gyp:nss',
],
+ 'export_dependent_settings': [
+ '../build/linux/system.gyp:nss',
+ ],
}
],
],