From e31d0f4ea1c644ea7bcabfe2fb090ba4f2727ffc Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Fri, 22 Sep 2017 14:03:14 -0700 Subject: [PATCH] Update the license script to include the topaz root and exclude Skia's version of libpng (#4136) --- sky/packages/sky_engine/LICENSE | 6 +- tools/licenses/lib/main.dart | 12 +- travis/licenses_golden/licenses_lib | 314 -------------------- travis/licenses_golden/licenses_third_party | 48 +-- travis/licenses_golden/licenses_topaz | 4 +- 5 files changed, 15 insertions(+), 369 deletions(-) delete mode 100644 travis/licenses_golden/licenses_lib diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 6f57bfd364128..8e1d45b8204c3 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -8663,7 +8663,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- engine garnet -tonic +topaz Copyright 2017 The Fuchsia Authors. All rights reserved. @@ -10137,7 +10137,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- garnet -tonic +topaz Copyright 2015 The Fuchsia Authors. All rights reserved. @@ -10168,7 +10168,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- garnet -tonic +topaz Copyright 2016 The Fuchsia Authors. All rights reserved. diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index da1b22bc57b59..e64bcb848ebe4 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -1797,6 +1797,7 @@ class RepositorySkiaThirdPartyDirectory extends RepositoryGenericThirdPartyDirec bool shouldRecurse(fs.IoNode entry) { return entry.name != 'giflib' // contains nothing that ends up in the binary executable && entry.name != 'freetype' // we use our own version + && entry.name != 'libpng' // we use our own version && entry.name != 'lua' // not linked in && entry.name != 'yasm' // build tool (assembler) && super.shouldRecurse(entry); @@ -1808,8 +1809,6 @@ class RepositorySkiaThirdPartyDirectory extends RepositoryGenericThirdPartyDirec return new RepositoryReachOutDirectory(this, entry, new Set.from(const ['ktx.h', 'ktx.cpp']), 2); if (entry.name == 'libmicrohttpd') return new RepositoryReachOutDirectory(this, entry, new Set.from(const ['MHD_config.h']), 2); - if (entry.name == 'libpng') - return new RepositoryLibPngDirectory(this, entry); if (entry.name == 'libwebp') return new RepositorySkiaLibWebPDirectory(this, entry); if (entry.name == 'libsdl') @@ -2074,13 +2073,6 @@ class RepositoryDartDirectory extends RepositoryDirectory { } } -class RepositoryRootLibDirectory extends RepositoryDirectory { - RepositoryRootLibDirectory(RepositoryDirectory parent, fs.Directory io) : super(parent, io); - - @override - bool get subdirectoriesAreLicenseRoots => true; -} - class RepositoryFlutterDirectory extends RepositoryDirectory { RepositoryFlutterDirectory(RepositoryDirectory parent, fs.Directory io) : super(parent, io); @@ -2243,8 +2235,6 @@ class RepositoryRoot extends RepositoryDirectory { throw '//base is no longer part of this client: remove it'; if (entry.name == 'third_party') return new RepositoryRootThirdPartyDirectory(this, entry); - if (entry.name == 'lib') - return new RepositoryRootLibDirectory(this, entry); if (entry.name == 'dart') return new RepositoryDartDirectory(this, entry); if (entry.name == 'flutter') diff --git a/travis/licenses_golden/licenses_lib b/travis/licenses_golden/licenses_lib deleted file mode 100644 index ca7e35de0921a..0000000000000 --- a/travis/licenses_golden/licenses_lib +++ /dev/null @@ -1,314 +0,0 @@ -Signature: 816678051aa93fd3b8b4c4e7ee451536 - -UNUSED LICENSES: - - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -USED LICENSES: - -==================================================================================================== -LIBRARY: ftl -LIBRARY: zip -ORIGIN: ../../../lib/ftl/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../lib/ftl/arraysize.h -FILE: ../../../lib/ftl/arraysize_unittest.cc -FILE: ../../../lib/ftl/build_config.h -FILE: ../../../lib/ftl/command_line.cc -FILE: ../../../lib/ftl/command_line.h -FILE: ../../../lib/ftl/command_line_unittest.cc -FILE: ../../../lib/ftl/compiler_specific.h -FILE: ../../../lib/ftl/debug/debugger.cc -FILE: ../../../lib/ftl/debug/debugger.h -FILE: ../../../lib/ftl/files/directory.cc -FILE: ../../../lib/ftl/files/directory.h -FILE: ../../../lib/ftl/files/eintr_wrapper.h -FILE: ../../../lib/ftl/files/file.cc -FILE: ../../../lib/ftl/files/file.h -FILE: ../../../lib/ftl/files/file_descriptor.cc -FILE: ../../../lib/ftl/files/file_descriptor.h -FILE: ../../../lib/ftl/files/file_unittest.cc -FILE: ../../../lib/ftl/files/path.h -FILE: ../../../lib/ftl/files/path_posix.cc -FILE: ../../../lib/ftl/files/path_unittest.cc -FILE: ../../../lib/ftl/files/scoped_temp_dir.cc -FILE: ../../../lib/ftl/files/scoped_temp_dir.h -FILE: ../../../lib/ftl/files/scoped_temp_dir_unittest.cc -FILE: ../../../lib/ftl/files/symlink.h -FILE: ../../../lib/ftl/files/symlink_posix.cc -FILE: ../../../lib/ftl/files/unique_fd.cc -FILE: ../../../lib/ftl/files/unique_fd.h -FILE: ../../../lib/ftl/functional/closure.h -FILE: ../../../lib/ftl/functional/make_copyable.h -FILE: ../../../lib/ftl/functional/make_copyable_unittest.cc -FILE: ../../../lib/ftl/functional/make_runnable.h -FILE: ../../../lib/ftl/log_level.h -FILE: ../../../lib/ftl/log_settings.cc -FILE: ../../../lib/ftl/log_settings.h -FILE: ../../../lib/ftl/log_settings_state.cc -FILE: ../../../lib/ftl/log_settings_unittest.cc -FILE: ../../../lib/ftl/logging.cc -FILE: ../../../lib/ftl/logging.h -FILE: ../../../lib/ftl/macros.h -FILE: ../../../lib/ftl/memory/ref_counted.h -FILE: ../../../lib/ftl/memory/ref_counted_internal.h -FILE: ../../../lib/ftl/memory/ref_counted_unittest.cc -FILE: ../../../lib/ftl/memory/ref_ptr.h -FILE: ../../../lib/ftl/memory/ref_ptr_internal.h -FILE: ../../../lib/ftl/memory/unique_object.h -FILE: ../../../lib/ftl/memory/weak_ptr.h -FILE: ../../../lib/ftl/memory/weak_ptr_internal.cc -FILE: ../../../lib/ftl/memory/weak_ptr_internal.h -FILE: ../../../lib/ftl/memory/weak_ptr_unittest.cc -FILE: ../../../lib/ftl/random/rand.cc -FILE: ../../../lib/ftl/random/rand.h -FILE: ../../../lib/ftl/random/uuid.cc -FILE: ../../../lib/ftl/random/uuid.h -FILE: ../../../lib/ftl/strings/ascii.cc -FILE: ../../../lib/ftl/strings/ascii.h -FILE: ../../../lib/ftl/strings/ascii_unittest.cc -FILE: ../../../lib/ftl/strings/concatenate.cc -FILE: ../../../lib/ftl/strings/concatenate.h -FILE: ../../../lib/ftl/strings/concatenate_unittest.cc -FILE: ../../../lib/ftl/strings/split_string.cc -FILE: ../../../lib/ftl/strings/split_string.h -FILE: ../../../lib/ftl/strings/split_string_unittest.cc -FILE: ../../../lib/ftl/strings/string_number_conversions.cc -FILE: ../../../lib/ftl/strings/string_number_conversions.h -FILE: ../../../lib/ftl/strings/string_number_conversions_unittest.cc -FILE: ../../../lib/ftl/strings/string_printf.cc -FILE: ../../../lib/ftl/strings/string_printf.h -FILE: ../../../lib/ftl/strings/string_printf_unittest.cc -FILE: ../../../lib/ftl/strings/string_view.cc -FILE: ../../../lib/ftl/strings/string_view.h -FILE: ../../../lib/ftl/strings/string_view_unittest.cc -FILE: ../../../lib/ftl/strings/trim.cc -FILE: ../../../lib/ftl/strings/trim.h -FILE: ../../../lib/ftl/strings/trim_unittest.cc -FILE: ../../../lib/ftl/strings/utf_codecs.cc -FILE: ../../../lib/ftl/strings/utf_codecs.h -FILE: ../../../lib/ftl/synchronization/cond_var.h -FILE: ../../../lib/ftl/synchronization/cond_var_posix.cc -FILE: ../../../lib/ftl/synchronization/cond_var_unittest.cc -FILE: ../../../lib/ftl/synchronization/mutex_unittest.cc -FILE: ../../../lib/ftl/synchronization/sleep.cc -FILE: ../../../lib/ftl/synchronization/sleep.h -FILE: ../../../lib/ftl/synchronization/thread_annotations.h -FILE: ../../../lib/ftl/synchronization/thread_annotations_unittest.cc -FILE: ../../../lib/ftl/synchronization/thread_checker.h -FILE: ../../../lib/ftl/synchronization/thread_checker_unittest.cc -FILE: ../../../lib/ftl/synchronization/waitable_event.cc -FILE: ../../../lib/ftl/synchronization/waitable_event.h -FILE: ../../../lib/ftl/synchronization/waitable_event_unittest.cc -FILE: ../../../lib/ftl/tasks/one_shot_timer.cc -FILE: ../../../lib/ftl/tasks/one_shot_timer.h -FILE: ../../../lib/ftl/tasks/one_shot_timer_unittest.cc -FILE: ../../../lib/ftl/tasks/task_runner.cc -FILE: ../../../lib/ftl/tasks/task_runner.h -FILE: ../../../lib/ftl/time/stopwatch.cc -FILE: ../../../lib/ftl/time/stopwatch.h -FILE: ../../../lib/ftl/time/time_delta.h -FILE: ../../../lib/ftl/time/time_point.cc -FILE: ../../../lib/ftl/time/time_point.h -FILE: ../../../lib/ftl/time/time_printers.cc -FILE: ../../../lib/ftl/time/time_unittest.cc -FILE: ../../../lib/zip/create_unzipper.cc -FILE: ../../../lib/zip/create_unzipper.h -FILE: ../../../lib/zip/memory_io.cc -FILE: ../../../lib/zip/memory_io.h -FILE: ../../../lib/zip/unique_unzipper.cc -FILE: ../../../lib/zip/unique_unzipper.h -FILE: ../../../lib/zip/unique_zipper.cc -FILE: ../../../lib/zip/unique_zipper.h -FILE: ../../../lib/zip/unzipper.cc -FILE: ../../../lib/zip/unzipper.h -FILE: ../../../lib/zip/zipper.cc -FILE: ../../../lib/zip/zipper.h ----------------------------------------------------------------------------------------------------- -Copyright 2016 The Fuchsia Authors. 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. -==================================================================================================== - -==================================================================================================== -LIBRARY: ftl -ORIGIN: ../../../garnet/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../lib/ftl/files/path_win.cc -FILE: ../../../lib/ftl/files/symlink_win.cc -FILE: ../../../lib/ftl/inttypes.h -FILE: ../../../lib/ftl/portable_unistd.h -FILE: ../../../lib/ftl/random/rand_unittest.cc -FILE: ../../../lib/ftl/strings/join_strings.h -FILE: ../../../lib/ftl/strings/join_strings_unittest.cc -FILE: ../../../lib/ftl/synchronization/cond_var_win.cc -FILE: ../../../lib/ftl/threading/thread.cc -FILE: ../../../lib/ftl/threading/thread.h ----------------------------------------------------------------------------------------------------- -Copyright 2017 The Fuchsia Authors. 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. -==================================================================================================== - -==================================================================================================== -LIBRARY: ftl -ORIGIN: ../../../lib/ftl/synchronization/monitor.cc + ../../../lib/ftl/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../lib/ftl/synchronization/monitor.cc -FILE: ../../../lib/ftl/synchronization/monitor.h -FILE: ../../../lib/ftl/synchronization/mutex.h -FILE: ../../../lib/ftl/synchronization/mutex_posix.cc ----------------------------------------------------------------------------------------------------- -Copyright 2016 The Fuchisa Authors. 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. -==================================================================================================== - -==================================================================================================== -LIBRARY: ftl -ORIGIN: ../../../lib/ftl/synchronization/mutex_win.cc + ../../../lib/ftl/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../lib/ftl/synchronization/mutex_win.cc ----------------------------------------------------------------------------------------------------- -Copyright 2017 The Fuchisa Authors. 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. -==================================================================================================== - -==================================================================================================== -LIBRARY: icu -ORIGIN: ../../../garnet/public/lib/fxl/third_party/icu/LICENSE -TYPE: LicenseType.unknown -FILE: ../../../lib/ftl/third_party/icu/icu_utf.cc -FILE: ../../../lib/ftl/third_party/icu/icu_utf.h ----------------------------------------------------------------------------------------------------- -ICU License - ICU 1.8.1 and later - -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1995-2009 International Business Machines Corporation and others - -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. - -THE SOFTWARE IS 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 -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY -SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER -RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. -==================================================================================================== -Total license count: 5 diff --git a/travis/licenses_golden/licenses_third_party b/travis/licenses_golden/licenses_third_party index 3df68a96df2de..7c36cb34b4c09 100644 --- a/travis/licenses_golden/licenses_third_party +++ b/travis/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 103c293e19f43dfead2e1afb179ce5d1 +Signature: 8eca905f6459bd8f4b9e084803ed1934 UNUSED LICENSES: @@ -3901,7 +3901,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ==================================================================================================== LIBRARY: freetype2 -ORIGIN: ../../../third_party/freetype2/docs/FXL.TXT +ORIGIN: ../../../third_party/freetype2/docs/FTL.TXT TYPE: LicenseType.freetype FILE: ../../../third_party/freetype2/.mailmap FILE: ../../../third_party/freetype2/Jamfile @@ -3936,9 +3936,9 @@ FILE: ../../../third_party/freetype2/include/ftgxval.h FILE: ../../../third_party/freetype2/include/ftgzip.h FILE: ../../../third_party/freetype2/include/ftimage.h FILE: ../../../third_party/freetype2/include/ftincrem.h -FILE: ../../../third_party/freetype2/include/fxlcdfil.h -FILE: ../../../third_party/freetype2/include/fxlist.h -FILE: ../../../third_party/freetype2/include/fxlzw.h +FILE: ../../../third_party/freetype2/include/ftlcdfil.h +FILE: ../../../third_party/freetype2/include/ftlist.h +FILE: ../../../third_party/freetype2/include/ftlzw.h FILE: ../../../third_party/freetype2/include/ftmac.h FILE: ../../../third_party/freetype2/include/ftmm.h FILE: ../../../third_party/freetype2/include/ftmodapi.h @@ -4062,7 +4062,7 @@ FILE: ../../../third_party/freetype2/src/base/ftgloadr.c FILE: ../../../third_party/freetype2/src/base/ftglyph.c FILE: ../../../third_party/freetype2/src/base/ftgxval.c FILE: ../../../third_party/freetype2/src/base/ftinit.c -FILE: ../../../third_party/freetype2/src/base/fxlcdfil.c +FILE: ../../../third_party/freetype2/src/base/ftlcdfil.c FILE: ../../../third_party/freetype2/src/base/ftmac.c FILE: ../../../third_party/freetype2/src/base/ftmm.c FILE: ../../../third_party/freetype2/src/base/ftobjs.c @@ -4194,7 +4194,7 @@ FILE: ../../../third_party/freetype2/src/gxvalid/gxvtrak.c FILE: ../../../third_party/freetype2/src/gzip/Jamfile FILE: ../../../third_party/freetype2/src/gzip/ftgzip.c FILE: ../../../third_party/freetype2/src/lzw/Jamfile -FILE: ../../../third_party/freetype2/src/lzw/fxlzw.c +FILE: ../../../third_party/freetype2/src/lzw/ftlzw.c FILE: ../../../third_party/freetype2/src/lzw/ftzopen.c FILE: ../../../third_party/freetype2/src/lzw/ftzopen.h FILE: ../../../third_party/freetype2/src/otvalid/Jamfile @@ -4461,7 +4461,7 @@ Legal Terms herein, subject to the following conditions: o Redistribution of source code must retain this license file - (`FXL.TXT') unaltered; any additions, deletions or changes to + (`FTL.TXT') unaltered; any additions, deletions or changes to the original files must be clearly indicated in accompanying documentation. The copyright notices of the unaltered, original files must be preserved in all copies of source @@ -4517,7 +4517,7 @@ Legal Terms http://www.freetype.org ---- end of FXL.TXT --- +--- end of FTL.TXT --- ==================================================================================================== ==================================================================================================== @@ -12508,8 +12508,6 @@ ORIGIN: ../../../third_party/libpng/LICENSE TYPE: LicenseType.libpng FILE: ../../../third_party/libpng/contrib/intel/intel_sse.patch FILE: ../../../third_party/libpng/pngprefix.h -FILE: ../../../third_party/skia/third_party/libpng/contrib/intel/intel_sse.patch -FILE: ../../../third_party/skia/third_party/libpng/pngprefix.h ---------------------------------------------------------------------------------------------------- ==================================================================================================== @@ -12546,34 +12544,6 @@ FILE: ../../../third_party/libpng/pngwio.c FILE: ../../../third_party/libpng/pngwrite.c FILE: ../../../third_party/libpng/pngwtran.c FILE: ../../../third_party/libpng/pngwutil.c -FILE: ../../../third_party/skia/third_party/libpng/arm/arm_init.c -FILE: ../../../third_party/skia/third_party/libpng/arm/filter_neon.S -FILE: ../../../third_party/skia/third_party/libpng/arm/filter_neon_intrinsics.c -FILE: ../../../third_party/skia/third_party/libpng/contrib/intel/filter_sse2_intrinsics.c -FILE: ../../../third_party/skia/third_party/libpng/contrib/intel/intel_init.c -FILE: ../../../third_party/skia/third_party/libpng/contrib/intel/intel_sse.patch -FILE: ../../../third_party/skia/third_party/libpng/png.c -FILE: ../../../third_party/skia/third_party/libpng/pngconf.h -FILE: ../../../third_party/skia/third_party/libpng/pngdebug.h -FILE: ../../../third_party/skia/third_party/libpng/pngerror.c -FILE: ../../../third_party/skia/third_party/libpng/pngget.c -FILE: ../../../third_party/skia/third_party/libpng/pnginfo.h -FILE: ../../../third_party/skia/third_party/libpng/pnglibconf.h -FILE: ../../../third_party/skia/third_party/libpng/pngmem.c -FILE: ../../../third_party/skia/third_party/libpng/pngpread.c -FILE: ../../../third_party/skia/third_party/libpng/pngpriv.h -FILE: ../../../third_party/skia/third_party/libpng/pngread.c -FILE: ../../../third_party/skia/third_party/libpng/pngrio.c -FILE: ../../../third_party/skia/third_party/libpng/pngrtran.c -FILE: ../../../third_party/skia/third_party/libpng/pngrutil.c -FILE: ../../../third_party/skia/third_party/libpng/pngset.c -FILE: ../../../third_party/skia/third_party/libpng/pngstruct.h -FILE: ../../../third_party/skia/third_party/libpng/pngtest.c -FILE: ../../../third_party/skia/third_party/libpng/pngtrans.c -FILE: ../../../third_party/skia/third_party/libpng/pngwio.c -FILE: ../../../third_party/skia/third_party/libpng/pngwrite.c -FILE: ../../../third_party/skia/third_party/libpng/pngwtran.c -FILE: ../../../third_party/skia/third_party/libpng/pngwutil.c ---------------------------------------------------------------------------------------------------- ==================================================================================================== diff --git a/travis/licenses_golden/licenses_topaz b/travis/licenses_golden/licenses_topaz index f07bd4fd89f9b..70bc640fe0f7c 100644 --- a/travis/licenses_golden/licenses_topaz +++ b/travis/licenses_golden/licenses_topaz @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: topaz -ORIGIN: ../../../lib/ftl/LICENSE +ORIGIN: ../../../topaz/lib/tonic/LICENSE TYPE: LicenseType.bsd FILE: ../../../topaz/lib/tonic/converter/dart_converter.cc FILE: ../../../topaz/lib/tonic/converter/dart_converter.h @@ -102,7 +102,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: topaz -ORIGIN: ../../../topaz/lib/tonic/typed_data/dart_byte_data.cc + ../../../lib/ftl/LICENSE +ORIGIN: ../../../topaz/lib/tonic/typed_data/dart_byte_data.cc + ../../../topaz/lib/tonic/LICENSE TYPE: LicenseType.bsd FILE: ../../../topaz/lib/tonic/dart_args.h FILE: ../../../topaz/lib/tonic/dart_binding_macros.h