summaryrefslogtreecommitdiffstats
path: root/third_party/mozc
diff options
context:
space:
mode:
authorsteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-27 01:52:11 +0000
committersteveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-27 01:52:11 +0000
commitabb1b86e9be367176950fe6a2cb4d47db72c73c0 (patch)
tree4923c3c0da21e560897d1961d31e3747332517f8 /third_party/mozc
parent6bdf093650147311383b38f0ad26d6d0f091b21f (diff)
downloadchromium_src-abb1b86e9be367176950fe6a2cb4d47db72c73c0.zip
chromium_src-abb1b86e9be367176950fe6a2cb4d47db72c73c0.tar.gz
chromium_src-abb1b86e9be367176950fe6a2cb4d47db72c73c0.tar.bz2
Fix third-party license information for a number of projects
Also fix a couple of bugs in the license tool. - When scanning, ignore directories that don't contain any files, on the assumption that these are DEPS directories for projects not used by our current configuration. - Don't recurse into directories in ADDITIONAL_PATHS, just as we don't for regular third_party/foo directories. Notes - License file for third_party/mozc was taken from source header. - LICENSE.chromium_os was copied from Chromium OS source tree. This fixes 'licenses.py scan' for an Android checkout. BUG=138921 Review URL: https://chromiumcodereview.appspot.com/10829042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mozc')
-rw-r--r--third_party/mozc/LICENSE29
-rw-r--r--third_party/mozc/README.chromium5
2 files changed, 34 insertions, 0 deletions
diff --git a/third_party/mozc/LICENSE b/third_party/mozc/LICENSE
new file mode 100644
index 0000000..014da20
--- /dev/null
+++ b/third_party/mozc/LICENSE
@@ -0,0 +1,29 @@
+Copyright 2010-2011, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+* Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+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.
+
diff --git a/third_party/mozc/README.chromium b/third_party/mozc/README.chromium
new file mode 100644
index 0000000..e82ab12
--- /dev/null
+++ b/third_party/mozc/README.chromium
@@ -0,0 +1,5 @@
+Name: Mozc Japanese Input Method Editor
+URL: http://code.google.com/p/mozc
+License: BSD
+Security Critical: yes
+Version: unknown