diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/activscp/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/safe_browsing/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/talloc/README.chromium | 3 | ||||
| -rwxr-xr-x | tools/licenses.py | 24 |
5 files changed, 21 insertions, 12 deletions
@@ -275,7 +275,7 @@ deps_os = { (Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@3", "src/third_party/openssl": - "/trunk/deps/third_party/openssl@68738", + "/trunk/deps/third_party/openssl@69192", }, } diff --git a/third_party/activscp/README.chromium b/third_party/activscp/README.chromium index a7dab91..8498d19 100644 --- a/third_party/activscp/README.chromium +++ b/third_party/activscp/README.chromium @@ -1,3 +1,4 @@ +Name: ActiveX Scripting SDK
URL: http://support.microsoft.com/kb/223389
Version: August 8, 2000
License: Scripting SDK license
@@ -11,4 +12,4 @@ Active Debugging to a host or engine. Local Modifications:
No Modifications - simply downloaded scriptng.exe, saved it to this
-directory, and ran it to extract its contents to the same directory.
\ No newline at end of file +directory, and ran it to extract its contents to the same directory.
diff --git a/third_party/safe_browsing/README.chromium b/third_party/safe_browsing/README.chromium index da27ff8..1b5df10 100644 --- a/third_party/safe_browsing/README.chromium +++ b/third_party/safe_browsing/README.chromium @@ -1,6 +1,5 @@ Name: Google Safe Browsing URL: http://code.google.com/p/google-safe-browsing/ - License: Apache 2.0 License File: testing/LICENSE diff --git a/third_party/talloc/README.chromium b/third_party/talloc/README.chromium index 88ae658..3174ab5 100644 --- a/third_party/talloc/README.chromium +++ b/third_party/talloc/README.chromium @@ -1,3 +1,6 @@ +Name: talloc +URL: http://talloc.samba.org/talloc/doc/html/index.html + The talloc library is only being used by a portion of the Mesa software renderer, in ../mesa/MesaLib, and is only linked in to the OSMesa shared library. diff --git a/tools/licenses.py b/tools/licenses.py index 8c1c14a..87a8bb8 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -21,6 +21,9 @@ import sys # Paths from the root of the tree to directories to skip. PRUNE_PATHS = set([ + # Same module occurs in both the top-level third_party and others. + "base/third_party/icu", + # Assume for now that breakpad has their licensing in order. "breakpad", @@ -31,6 +34,12 @@ PRUNE_PATHS = set([ # Assume for now that native client has their licensing in order. "native_client", + # Same module occurs in chrome/ and in net/, so skip one of them. + "net/third_party/mozilla_security_manager", + + # Same module occurs in base/ and in net/, so skip one of them. + "net/third_party/nss", + # We don't bundle o3d samples into our resulting binaries. "o3d/samples", @@ -40,18 +49,15 @@ PRUNE_PATHS = set([ # Written as part of Chromium. "third_party/fuzzymatch", + # Same license as Chromium. + "third_party/lss", + + # Only binaries, used during development. + "third_party/valgrind", + # 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", - - # Same module occurs in chrome/ and in net/, so skip one of them. - "net/third_party/mozilla_security_manager", - - # Same module occurs in both the top-level third_party and others. - "base/third_party/icu", ]) # Directories we don't scan through. |