diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/tools/licenses.py | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/tools/licenses.py')
| -rwxr-xr-x | chromium/tools/licenses.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chromium/tools/licenses.py b/chromium/tools/licenses.py index 9a6602b855a..7a77710c0c5 100755 --- a/chromium/tools/licenses.py +++ b/chromium/tools/licenses.py @@ -29,6 +29,9 @@ PRUNE_PATHS = set([ # Placeholder directory only, not third-party code. os.path.join('third_party','adobe'), + # Already covered by //third_party/android_tools. + os.path.join('third_party','android_tools_internal'), + # Apache 2.0 license. See crbug.com/140478 os.path.join('third_party','bidichecker'), @@ -42,11 +45,13 @@ PRUNE_PATHS = set([ os.path.join('build','secondary'), os.path.join('third_party','bison'), os.path.join('third_party','blanketjs'), + os.path.join('third_party','chromite'), os.path.join('third_party','cygwin'), os.path.join('third_party','gles2_conform'), os.path.join('third_party','gnu_binutils'), os.path.join('third_party','gold'), os.path.join('third_party','gperf'), + os.path.join('third_party','jarjar'), os.path.join('third_party','kasko'), os.path.join('third_party','lighttpd'), os.path.join('third_party','llvm'), @@ -56,6 +61,7 @@ PRUNE_PATHS = set([ os.path.join('third_party','pefile'), os.path.join('third_party','perl'), os.path.join('third_party','psyco_win32'), + os.path.join('third_party','pyelftools'), os.path.join('third_party','pylib'), os.path.join('third_party','pywebsocket'), os.path.join('third_party','qunit'), @@ -166,12 +172,6 @@ SPECIAL_CASES = { "URL": "http://code.google.com/p/pdfium/", "License": "BSD", }, - os.path.join('third_party', 'pdfsqueeze'): { - "Name": "pdfsqueeze", - "URL": "http://code.google.com/p/pdfsqueeze/", - "License": "Apache 2.0", - "License File": "COPYING", - }, os.path.join('third_party', 'ppapi'): { "Name": "ppapi", "URL": "http://code.google.com/p/ppapi/", @@ -298,7 +298,6 @@ KNOWN_NON_IOS_LIBRARIES = set([ os.path.join('third_party', 'mozilla'), os.path.join('third_party', 'npapi'), os.path.join('third_party', 'ots'), - os.path.join('third_party', 'pdfsqueeze'), os.path.join('third_party', 'ppapi'), os.path.join('third_party', 'qcms'), os.path.join('third_party', 're2'), |