diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 21:24:28 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 21:24:28 +0000 |
| commit | 813908a4e9fdc574ce56eba2e562cb467cba1b0a (patch) | |
| tree | 052a9d41dc882a0e54aabc182e190b3b78286458 /net/third_party | |
| parent | c8d0c146d5b213326980e360172394ca08f790ba (diff) | |
| download | chromium_src-813908a4e9fdc574ce56eba2e562cb467cba1b0a.zip chromium_src-813908a4e9fdc574ce56eba2e562cb467cba1b0a.tar.gz chromium_src-813908a4e9fdc574ce56eba2e562cb467cba1b0a.tar.bz2 | |
Roll NSS from 136057:137477
Picks up r137477 - Split the nssckbi target off from the 'nss' target and r137925 - post review comment update
BUG=123666
TEST=compiles
R=wtc
Review URL: https://chromiumcodereview.appspot.com/10386177
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index 0380c0e..260897a 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -142,6 +142,10 @@ '../../../third_party/nss/nss.gyp:nspr', '../../../third_party/nss/nss.gyp:nss', ], + 'export_dependent_settings': [ + '../../../third_party/nss/nss.gyp:nspr', + '../../../third_party/nss/nss.gyp:nss', + ], 'direct_dependent_settings': { 'include_dirs': [ 'ssl', |