Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bundletool to DEPS and remove outdated header comment #28040

Merged
merged 5 commits into from
Aug 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions DEPS
Original file line number Diff line number Diff line change
@@ -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',
Expand Down Expand Up @@ -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': [
{
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: ba62ed10d5e046f90a397663d6c9d5d2
Signature: 8657ee54922fa27c46d6c88773a1431d

12 changes: 12 additions & 0 deletions tools/licenses/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);

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