Skip to content

Commit

Permalink
Update the license script to include the topaz root and exclude Skia'…
Browse files Browse the repository at this point in the history
…s version of libpng (flutter#4136)
  • Loading branch information
jason-simmons authored Sep 22, 2017
1 parent fc3cb8f commit e31d0f4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 369 deletions.
6 changes: 3 additions & 3 deletions sky/packages/sky_engine/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
12 changes: 1 addition & 11 deletions tools/licenses/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -1808,8 +1809,6 @@ class RepositorySkiaThirdPartyDirectory extends RepositoryGenericThirdPartyDirec
return new RepositoryReachOutDirectory(this, entry, new Set<String>.from(const <String>['ktx.h', 'ktx.cpp']), 2);
if (entry.name == 'libmicrohttpd')
return new RepositoryReachOutDirectory(this, entry, new Set<String>.from(const <String>['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')
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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')
Expand Down
314 changes: 0 additions & 314 deletions travis/licenses_golden/licenses_lib

This file was deleted.

Loading

0 comments on commit e31d0f4

Please sign in to comment.