Skip to content

Commit

Permalink
Get licenses check deps from gclient rather than pub (flutter#26077)
Browse files Browse the repository at this point in the history
  • Loading branch information
zanderso authored May 12, 2021
1 parent b629338 commit 5d67ad1
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 9 deletions.
8 changes: 6 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -394,10 +394,14 @@ deps = {
'src/third_party/abseil-cpp':
Var('chromium_git') + '/chromium/src/third_party/abseil-cpp.git' + '@' + '2d8c1340f0350828f1287c4eaeebefcf317bcfc9',

# Dart packages
'src/third_party/pkg/archive':
Var('github_git') + '/brendan-duncan/archive.git' + '@' + '3.1.2',

'src/third_party/pkg/when':
Var('dart_git') + '/when.git' + '@' + '0.2.0',
Var('dart_git') + '/when.git' + '@' + '0.2.0',

'src/third_party/android_tools/ndk': {
'src/third_party/android_tools/ndk': {
'packages': [
{
'package': 'flutter/android/ndk/${{platform}}',
Expand Down
1 change: 0 additions & 1 deletion ci/licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ dart --version
# Runs in a subshell.
function collect_licenses() (
cd "$SRC_DIR/flutter/tools/licenses"
pub get
dart --enable-asserts lib/main.dart \
--src ../../.. \
--out ../../../out/license_script_output \
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: d165688a88dd53153d8e32bd26d3fa6d
Signature: dd0af3be798528c3303ec68043c4785c

5 changes: 5 additions & 0 deletions tools/licenses/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1662,6 +1662,11 @@ class _RepositoryLibWebpDirectory extends _RepositoryDirectory {
class _RepositoryPkgDirectory extends _RepositoryDirectory {
_RepositoryPkgDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);

@override
bool shouldRecurse(fs.IoNode entry) {
return entry.name != 'archive'; // contains nothing that ends up in the binary executable
}

@override
_RepositoryDirectory createSubdirectory(fs.Directory entry) {
if (entry.name == 'when')
Expand Down
40 changes: 35 additions & 5 deletions tools/licenses/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,40 @@
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

name: licenses
publish_to: none
environment:
sdk: '>=2.8.0 <3.0.0'

# Do not add any dependencies that require more than what is provided in
# //third_party.pkg, //third_party/dart/pkg, or
# //third_party/dart/third_party/pkg. In particular, package:test is not usable
# here.

# If you do add packages here, make sure you can run `pub get --offline`, and
# check the .packages and .package_config to make sure all the paths are
# relative to this directory into //third_party/dart

dependencies:
archive: ^2.0.4
args: 1.5.0
crypto: ^2.0.2+1
meta: ^1.1.6
path: ^1.3.0
archive: any
args: any
crypto: any
meta: any
path: any

dependency_overrides:
archive:
path: ../../../third_party/pkg/archive
args:
path: ../../../third_party/dart/third_party/pkg/args
collection:
path: ../../../third_party/dart/third_party/pkg/collection
crypto:
path: ../../../third_party/dart/third_party/pkg/crypto
meta:
path: ../../../third_party/dart/pkg/meta
path:
path: ../../../third_party/dart/third_party/pkg/path
typed_data:
path: ../../../third_party/dart/third_party/pkg/typed_data
1 change: 1 addition & 0 deletions tools/pub_get_offline.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
ALL_PACKAGES = [
os.path.join("src", "flutter", "flutter_frontend_server"),
os.path.join("src", "flutter", "tools", "const_finder"),
os.path.join("src", "flutter", "tools", "licenses"),
]


Expand Down

0 comments on commit 5d67ad1

Please sign in to comment.