diff --git a/DEPS b/DEPS index 1bcc02ada896f8c7d7020a540be25510da416c6d..b48d3009895827cfa311ddebe72767f1cf334f48 100644 --- a/DEPS +++ b/DEPS @@ -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 -# where 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': [ { diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index f65028e32b258d0e0a37ab1c1c1ae7788e30c7fa..02071d2e72d7e21862b70abad9460d4f8256ff71 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: ba62ed10d5e046f90a397663d6c9d5d2 +Signature: 8657ee54922fa27c46d6c88773a1431d diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index 7a5d25c230a041c6a3ae13b477a8c98ed8069050..e8afee3c5d1fdd06e9dea88626571c9ec726ea25 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -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')