DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add bundletool to DEPS and remove outdated header comment (flutter/engine#28040)

Browse Source
This commit is contained in:
Gary Qian 2021-08-16 21:06:20 -07:00 committed by GitHub
parent 88218693ef
commit b7a7fbefbd
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
DEPS
View File

@ -1,21 +1,7 @@
# This file is automatically processed to create .DEPS.git which is the file
# that gclient uses under git.
# This file contains the dependencies used by the Engine repo.
#
# See http://code.google.com/p/chromium/wiki/UsingGit
#
# To test manually, run:
# python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
# where <gcliendir> is the absolute path to the directory containing the
# .gclient file (the parent of 'src').
#
# Then commit .DEPS.git locally (gclient doesn't like dirty trees) and run
# gclient sync..
# Verify the thing happened you wanted. Then revert your .DEPS.git change
# DO NOT CHECK IN CHANGES TO .DEPS.git upstream. It will be automatically
# updated by a bot when you modify this one.
#
# When adding a new dependency, please update the top-level .gitignore file
# to list the dependency's destination directory.
# Use the `gclient sync` command to download and sync local checkouts
# with the versions listed in this file.
vars = {
'chromium_git': 'https://chromium.googlesource.com',
@ -445,6 +431,16 @@ deps = {
'src/third_party/pkg/when':
Var('dart_git') + '/when.git' + '@' + '0.2.0',
'src/third_party/bundletool': {
'packages': [
{
'package': 'flutter/android/bundletool',
'version': 'version:1.7.1.1'
}
],
'dep_type': 'cipd',
},
'src/third_party/android_tools/ndk': {
'packages': [
{

2
engine/src/flutter/ci/licenses_golden/tool_signature
View File

@ -1,2 +1,2 @@
Signature: ba62ed10d5e046f90a397663d6c9d5d2
Signature: 8657ee54922fa27c46d6c88773a1431d

12
engine/src/flutter/tools/licenses/lib/main.dart
View File

@ -1497,6 +1497,16 @@ class _RepositoryIcuDirectory extends _RepositoryDirectory {
}
}
class _RepositoryBundletoolDirectory extends _RepositoryDirectory {
_RepositoryBundletoolDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
@override
bool shouldRecurse(fs.IoNode entry) {
return entry.name != 'bundletool.jar' // redundant with LICENSE file
&& super.shouldRecurse(entry);
}
}
class _RepositoryHarfbuzzDirectory extends _RepositoryDirectory {
_RepositoryHarfbuzzDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
@ -1858,6 +1868,8 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
return _RepositoryHarfbuzzDirectory(this, entry);
if (entry.name == 'icu')
return _RepositoryIcuDirectory(this, entry);
if (entry.name == 'bundletool')
return _RepositoryBundletoolDirectory(this, entry);
if (entry.name == 'jsr-305')
return _RepositoryJSR305Directory(this, entry);
if (entry.name == 'libcxx')