diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 21:22:49 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 21:22:49 +0000 |
| commit | a9d31ef4508af244599ae096be8e33c6bfec029b (patch) | |
| tree | 0f69c5b6df25230e07c83d4a302d4a075c65f498 | |
| parent | 16127bcad237da97b83867f75517f46f836b1a7f (diff) | |
| download | chromium_src-a9d31ef4508af244599ae096be8e33c6bfec029b.zip chromium_src-a9d31ef4508af244599ae096be8e33c6bfec029b.tar.gz chromium_src-a9d31ef4508af244599ae096be8e33c6bfec029b.tar.bz2 | |
Fix license metadata for ppapi
Currently, the license file mentions only the BSD license, but some of the code
in lib/ seems to use an MIT license.
Also include this directory in the list of extra directories scanned by the
license tool.
BUG=138921
Review URL: https://chromiumcodereview.appspot.com/10828117
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149700 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ppapi/LICENSE | 26 | ||||
| -rw-r--r-- | ppapi/README.chromium | 4 | ||||
| -rwxr-xr-x | tools/licenses.py | 1 |
3 files changed, 30 insertions, 1 deletions
diff --git a/ppapi/LICENSE b/ppapi/LICENSE index 8dc3504..dd8b4c4 100644 --- a/ppapi/LICENSE +++ b/ppapi/LICENSE @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -25,3 +25,27 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +/* +** Copyright (c) 2007-2010 The Khronos Group Inc. +** +** Permission is hereby granted, free of charge, to any person obtaining a +** copy of this software and/or associated documentation files (the +** "Materials"), to deal in the Materials without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Materials, and to +** permit persons to whom the Materials are 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 Materials. +** +** THE MATERIALS ARE 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 +** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +*/ diff --git a/ppapi/README.chromium b/ppapi/README.chromium new file mode 100644 index 0000000..5d0b4244 --- /dev/null +++ b/ppapi/README.chromium @@ -0,0 +1,4 @@ +Name: PPAPI +URL: http://code.google.com/p/ppapi +License: BSD and MIT +Security Critical: yes diff --git a/tools/licenses.py b/tools/licenses.py index 1ccdc41..2a87df7 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -95,6 +95,7 @@ PRUNE_DIRS = ('.svn', '.git', # VCS metadata ADDITIONAL_PATHS = ( os.path.join('googleurl'), os.path.join('native_client_sdk'), + os.path.join('ppapi'), # The directory with the word list for Chinese and Japanese segmentation # with different license terms than ICU. os.path.join('third_party','icu','source','data','brkitr'), |