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
parent 16127bca
// 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 // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
...@@ -25,3 +25,27 @@ ...@@ -25,3 +25,27 @@
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // 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.
*/
Name: PPAPI
URL: http://code.google.com/p/ppapi
License: BSD and MIT
Security Critical: yes
...@@ -95,6 +95,7 @@ PRUNE_DIRS = ('.svn', '.git', # VCS metadata ...@@ -95,6 +95,7 @@ PRUNE_DIRS = ('.svn', '.git', # VCS metadata
ADDITIONAL_PATHS = ( ADDITIONAL_PATHS = (
os.path.join('googleurl'), os.path.join('googleurl'),
os.path.join('native_client_sdk'), os.path.join('native_client_sdk'),
os.path.join('ppapi'),
# The directory with the word list for Chinese and Japanese segmentation # The directory with the word list for Chinese and Japanese segmentation
# with different license terms than ICU. # with different license terms than ICU.
os.path.join('third_party','icu','source','data','brkitr'), os.path.join('third_party','icu','source','data','brkitr'),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment