summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 00:52:09 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 00:52:09 +0000
commit6bb6373d4b1567737438d5f048e35765dbfe8553 (patch)
treefaa09fa59516cd4fb24172d4f889922486481254
parent219d1a6b592cfcb4028b4ff58bb3b4bb4e1684ec (diff)
downloadchromium_src-6bb6373d4b1567737438d5f048e35765dbfe8553.zip
chromium_src-6bb6373d4b1567737438d5f048e35765dbfe8553.tar.gz
chromium_src-6bb6373d4b1567737438d5f048e35765dbfe8553.tar.bz2
licenses: don't double-include NSS in about:credits
Just manually blacklist one of the copies. We already do this for some other modules. BUG=42663 Review URL: http://codereview.chromium.org/1803004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45765 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/about_credits.html45
-rwxr-xr-xtools/licenses.py3
2 files changed, 3 insertions, 45 deletions
diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html
index bac08bb..3bdf522 100644
--- a/chrome/browser/resources/about_credits.html
+++ b/chrome/browser/resources/about_credits.html
@@ -658,51 +658,6 @@ You may recompile and redistribute these definitions as required.
<div class="product">
-<span class="title">Network Security Services (NSS)</span>
-<a class="show" href="#" onclick="return toggle(this);">show license</a>
-<span class="homepage"><a href="http://www.mozilla.org/projects/security/pki/nss/">homepage</a></span>
-<div class="licence">
-<pre>/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1994-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-</pre>
-</div>
-</div>
-
-
-<div class="product">
<span class="title">WebKit</span>
<a class="show" href="#" onclick="return toggle(this);">show license</a>
<span class="homepage"><a href="http://webkit.org/">homepage</a></span>
diff --git a/tools/licenses.py b/tools/licenses.py
index 7040c5b..ca3c821 100755
--- a/tools/licenses.py
+++ b/tools/licenses.py
@@ -43,6 +43,9 @@ PRUNE_PATHS = set([
# Two directories that are the same as those in base/third_party.
"v8/src/third_party/dtoa",
"v8/src/third_party/valgrind",
+
+ # Same module occurs in base/ and in net/, so skip one of them.
+ "net/third_party/nss",
])
# Directories we don't scan through.