diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 17:35:34 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 17:35:34 +0000 |
| commit | f3b87bb6521e194802996c2f83616ed196d18fd8 (patch) | |
| tree | cebeebbf72dbfd2c9f3c04c27d47ed92bfce4719 /net | |
| parent | 4decd920b0d8781183f580dd3eab517a311ba0f5 (diff) | |
| download | chromium_src-f3b87bb6521e194802996c2f83616ed196d18fd8.zip chromium_src-f3b87bb6521e194802996c2f83616ed196d18fd8.tar.gz chromium_src-f3b87bb6521e194802996c2f83616ed196d18fd8.tar.bz2 | |
net: rename NSS's 'ssl' to 'libssl'
ninja doesn't like there being several targets with the name 'ssl', so I
renamed NSS's 'ssl' target to 'libssl'.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/8907043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.gyp | 8 | ||||
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/net.gyp b/net/net.gyp index 040c1e0..e03bd18 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -914,7 +914,7 @@ 'dependencies': [ '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', - 'third_party/nss/ssl.gyp:ssl', + 'third_party/nss/ssl.gyp:libssl', 'tld_cleanup', ], }, { # else: OS != "win" @@ -932,7 +932,7 @@ 'dependencies': [ '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', - 'third_party/nss/ssl.gyp:ssl', + 'third_party/nss/ssl.gyp:libssl', ], 'link_settings': { 'libraries': [ @@ -1260,7 +1260,7 @@ '../third_party/icu/icu.gyp:icudata', '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', - 'third_party/nss/ssl.gyp:ssl', + 'third_party/nss/ssl.gyp:libssl', ], }, ], @@ -1268,7 +1268,7 @@ 'dependencies': [ '../third_party/nss/nss.gyp:nspr', '../third_party/nss/nss.gyp:nss', - 'third_party/nss/ssl.gyp:ssl', + 'third_party/nss/ssl.gyp:libssl', ], }, ], diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index 171a136..ada0bf0 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -21,7 +21,7 @@ 'targets': [ { - 'target_name': 'ssl', + 'target_name': 'libssl', 'type': 'static_library', 'sources': [ 'ssl/authcert.c', |