summaryrefslogtreecommitdiffstats
path: root/third_party/tcmalloc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 15:29:44 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-15 15:29:44 +0000
commit2539549a72944343b06d909da3cb2aaacd234d1f (patch)
treec58e7efee618b931d70d4e5928d068047ff471f6 /third_party/tcmalloc
parentd1b229dc75dbe281e3d7e4c2fdcbbe42f7457bd0 (diff)
downloadchromium_src-2539549a72944343b06d909da3cb2aaacd234d1f.zip
chromium_src-2539549a72944343b06d909da3cb2aaacd234d1f.tar.gz
chromium_src-2539549a72944343b06d909da3cb2aaacd234d1f.tar.bz2
Pass tools/licenses.py for more directories.
We're now down to only 4 dirs that don't pass the license checker. They will require separate changes. Modify the license checker to only print failing dirs. BUG=39240 Review URL: http://codereview.chromium.org/1530040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
-rw-r--r--third_party/tcmalloc/LICENSE28
-rw-r--r--third_party/tcmalloc/README.chromium13
2 files changed, 34 insertions, 7 deletions
diff --git a/third_party/tcmalloc/LICENSE b/third_party/tcmalloc/LICENSE
new file mode 100644
index 0000000..13e8476
--- /dev/null
+++ b/third_party/tcmalloc/LICENSE
@@ -0,0 +1,28 @@
+// Copyright (c) 2005, 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/tcmalloc/README.chromium b/third_party/tcmalloc/README.chromium
index f699fc9f..a8352a9 100644
--- a/third_party/tcmalloc/README.chromium
+++ b/third_party/tcmalloc/README.chromium
@@ -1,11 +1,10 @@
+Name: tcmalloc
+URL: http://google-perftools.googlecode.com/
+
This contains Chromium's locally patched copy of tcmalloc.
Contents:
- README.chromium
-
- This file you're looking at right now.
-
chromium/
The chromium patched sources, copied from the vendor/
@@ -26,7 +25,7 @@ Contents:
Last Changed Rev: 77
Last Changed Date: 2009-10-27 10:30:52 -0700 (Tue, 27 Oct 2009)
-
+
HOWTOs:
@@ -52,7 +51,7 @@ HOWTOs:
"diff -q -r" output from above)
5) Create the CL, upload, check it in:
-
+
$ gcl change CL
$ gcl upload CL
$ gcl commit CL
@@ -69,7 +68,7 @@ HOWTOs:
2) Resolve any conflicts
3) Create the CL, upload, check in:
-
+
$ gcl change CL
$ gcl upload CL
$ gcl commit CL