diff options
author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 11:56:25 +0000 |
---|---|---|
committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 11:56:25 +0000 |
commit | 4af547270ddc0aa60e53f17ed09857e63742cb65 (patch) | |
tree | bbeb3891e30363f647c25c5d4a116b13ae1a105d /third_party | |
parent | 94bbdac2dcb4ab8a719e21fec1e255ad1cad59f0 (diff) | |
download | chromium_src-4af547270ddc0aa60e53f17ed09857e63742cb65.zip chromium_src-4af547270ddc0aa60e53f17ed09857e63742cb65.tar.gz chromium_src-4af547270ddc0aa60e53f17ed09857e63742cb65.tar.bz2 |
Fix third-party license information for a number of projects
This fixes 'licenses.py scan' for the projects relevant to the Android WebView
build.
BUG=138921
Review URL: https://chromiumcodereview.appspot.com/10796121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/flot/README.chromium | 9 | ||||
-rw-r--r-- | third_party/json_minify/LICENSE | 22 | ||||
-rw-r--r-- | third_party/json_minify/README.chromium | 2 | ||||
-rw-r--r-- | third_party/libusb/README.chromium | 1 | ||||
-rw-r--r-- | third_party/pymox/README.chromium | 5 | ||||
-rw-r--r-- | third_party/sfntly/README.chromium | 2 | ||||
-rw-r--r-- | third_party/snappy/README.chromium | 1 | ||||
-rw-r--r-- | third_party/yasm/README.chromium | 6 |
8 files changed, 42 insertions, 6 deletions
diff --git a/third_party/flot/README.chromium b/third_party/flot/README.chromium new file mode 100644 index 0000000..acee5bc --- /dev/null +++ b/third_party/flot/README.chromium @@ -0,0 +1,9 @@ +Name: Flot Javascript/JQuery library for creating graphs +Short Name: Flot +URL: code.google.com/p/flot and http://drupal.org/project/flot +Version: 0.7 +License: MIT +License File: LICENSE.txt +Security Critical: yes +Description: Flot is used in the webui for performance monitor to draw charts of performance metrics. +Local Modifications: none diff --git a/third_party/json_minify/LICENSE b/third_party/json_minify/LICENSE new file mode 100644 index 0000000..9c067fd --- /dev/null +++ b/third_party/json_minify/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) Kyle Simpson + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/third_party/json_minify/README.chromium b/third_party/json_minify/README.chromium index 019c326..ccd4122 100644 --- a/third_party/json_minify/README.chromium +++ b/third_party/json_minify/README.chromium @@ -3,8 +3,6 @@ URL: https://github.com/getify/JSON.minify and also https://github.com/kitcambridge/JSON.minify Version: 0.1 License: MIT License -License file: https://github.com/getify/JSON.minify/blob/master/README.txt -(README has license info) Security Critical: no Description: diff --git a/third_party/libusb/README.chromium b/third_party/libusb/README.chromium index 74dd6c5..e34f1f7 100644 --- a/third_party/libusb/README.chromium +++ b/third_party/libusb/README.chromium @@ -2,6 +2,7 @@ Name: libusb URL: http://libusb.org Version: 1.0.8 License: LGPL 2.1 +License File: src/COPYING Security Critical: yes Description: diff --git a/third_party/pymox/README.chromium b/third_party/pymox/README.chromium index 7f87736..2fcb14c 100644 --- a/third_party/pymox/README.chromium +++ b/third_party/pymox/README.chromium @@ -1,10 +1,11 @@ Name: Python Mox Short Name: pymox URL: http://pymox.googlecode.com/svn/trunk -License File: COPYING +License: Apache 2.0 +License File: src/COPYING Security Critical: no Version: NA Revision: r70 Local files (not taken from upstream): -README.chromium
\ No newline at end of file +README.chromium diff --git a/third_party/sfntly/README.chromium b/third_party/sfntly/README.chromium index 84a4c0b..d351bd5 100644 --- a/third_party/sfntly/README.chromium +++ b/third_party/sfntly/README.chromium @@ -3,6 +3,8 @@ URL: http://code.google.com/p/sfntly/ Version: unknown Revision: 111 Security Critical: yes +License: Apache 2.0 +License File: COPYING.txt Description: sfntly is a C++ library for using, editing, and creating sfnt container based diff --git a/third_party/snappy/README.chromium b/third_party/snappy/README.chromium index abb3273..feaf48d 100644 --- a/third_party/snappy/README.chromium +++ b/third_party/snappy/README.chromium @@ -3,6 +3,7 @@ Short Name: snappy URL: http://code.google.com/p/snappy/ Version: r63 License: New BSD +License File: src/COPYING Security Critical: yes Description: diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index 5bf178d..3630013 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -1,6 +1,10 @@ Name: yasm URL: http://www.tortall.net/projects/yasm/ Version: 1.1.0 +License: 2-clause or 3-clause BSD licensed, with the exception of bitvect, which is triple-licensed under the Artistic license, GPL, and LGPL +License File: source/patched-yasm/COPYING +Security Critical: no + With these patches merged: * https://github.com/yasm/yasm/commit/a2cbb10ee1b90b73647667ac849c74d65761d412 * https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51 @@ -8,8 +12,6 @@ With these patches merged: * https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e * https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36 -License File: source/patched-yasm/COPYING -Security Critical: no See also the yasm.gyp file for a description of the yasm build process. |