Skip to content

Commit

Permalink
Fix third-party license information for a number of projects
Browse files Browse the repository at this point in the history
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
  • Loading branch information
steveblock@chromium.org committed Jul 26, 2012
1 parent 94bbdac commit 4af5472
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 6 deletions.
9 changes: 9 additions & 0 deletions third_party/flot/README.chromium
Original file line number Diff line number Diff line change
@@ -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
22 changes: 22 additions & 0 deletions third_party/json_minify/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 0 additions & 2 deletions third_party/json_minify/README.chromium
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions third_party/libusb/README.chromium
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions third_party/pymox/README.chromium
Original file line number Diff line number Diff line change
@@ -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
README.chromium
2 changes: 2 additions & 0 deletions third_party/sfntly/README.chromium
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions third_party/snappy/README.chromium
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions third_party/yasm/README.chromium
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
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
* https://github.com/yasm/yasm/commit/82fafa7b5619e702c8681c959ade0746498e3cbc
* 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.

Expand Down

0 comments on commit 4af5472

Please sign in to comment.