diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 15:47:21 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 15:47:21 +0000 |
| commit | e459859d1e532ce747d0090f434981f3a5b10bc9 (patch) | |
| tree | bad06f7d50e27afc1e898d695b137f86d561a8bf /net | |
| parent | 450fd02af7c65f6b4109a6deec82d2f0e026ee53 (diff) | |
| download | chromium_src-e459859d1e532ce747d0090f434981f3a5b10bc9.zip chromium_src-e459859d1e532ce747d0090f434981f3a5b10bc9.tar.gz chromium_src-e459859d1e532ce747d0090f434981f3a5b10bc9.tar.bz2 | |
Update license tool to check several additional directories
Some of these directories are currently excluded from the license check. This change fixes the metadata where required and removes them from PRUNE_PATHS.
Other directories contain third-party code, but aren't in directories named 'third-party', so aren't checked by the license tool by default. This change fixes the metadata where required and adds them to ADDITIONAL_PATHS.
To avoid adding to about:credits licenses for modules that don't ship as part of the product, this change also introduces a special 'NOT_SHIPPED' value for the 'License File' field.
This will simplify the process of adding a tool to check license compatibility for the Android WebView build.
BUG=138921
Review URL: https://chromiumcodereview.appspot.com/10830201
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/third_party/mozilla_security_manager/README.chromium | 5 | ||||
| -rw-r--r-- | net/third_party/nss/README.chromium | 5 | ||||
| -rw-r--r-- | net/tools/spdyshark/README.chromium | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/net/third_party/mozilla_security_manager/README.chromium b/net/third_party/mozilla_security_manager/README.chromium index d030d65..2c4039f 100644 --- a/net/third_party/mozilla_security_manager/README.chromium +++ b/net/third_party/mozilla_security_manager/README.chromium @@ -2,10 +2,15 @@ Name: Mozilla Personal Security Manager URL: http://mxr.mozilla.org/mozilla1.9.2/source/security/manager/ InfoURL: http://www.mozilla.org/ Version: Mozilla 1.9.2 +License: MPL 1.1 / GPL 2.0 / LGPL 2.1 +License File: NOT_SHIPPED Description: This is selected code bits from Mozilla's Personal Security Manager. +The same module appears in chrome/third_party/mozilla_security_manager, so we +don't repeat the license file here. + Local Modifications: Files are forked from Mozilla's because of the heavy adaptations necessary. Differences are using Chromium localization and other libraries instead of diff --git a/net/third_party/nss/README.chromium b/net/third_party/nss/README.chromium index 95e7973..1069bdd 100644 --- a/net/third_party/nss/README.chromium +++ b/net/third_party/nss/README.chromium @@ -2,10 +2,15 @@ Name: Network Security Services (NSS) URL: http://www.mozilla.org/projects/security/pki/nss/ Version: 3.13.4 pre-release snapshot 20120319 Security Critical: Yes +License: MPL 1.1/GPL 2.0/LGPL 2.1 +License FILE: NOT_SHIPPED This directory includes a copy of NSS's libssl from the CVS repo at: :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot +The same module appears in crypto/third_party/nss (and third_party/nss on some +platforms), so we don't repeat the license file here. + The snapshot was updated to the CVS tag: NSS_SSL_3_13_4_20120319_TAG Patches: diff --git a/net/tools/spdyshark/README.chromium b/net/tools/spdyshark/README.chromium new file mode 100644 index 0000000..d8dbcf1 --- /dev/null +++ b/net/tools/spdyshark/README.chromium @@ -0,0 +1,4 @@ +Name: Spdyshark +URL: http://anonsvn.wireshark.org/wireshark/trunk +License: GPL v2 +Security Critical: no |