diff --git a/DEPS b/DEPS index 0e64a700b2fac..2a11207c0b7b3 100644 --- a/DEPS +++ b/DEPS @@ -1,7 +1,21 @@ -# This file contains the dependencies used by the Engine repo. +# This file is automatically processed to create .DEPS.git which is the file +# that gclient uses under git. # -# Use the `gclient sync` command to download and sync local checkouts -# with the versions listed in this file. +# 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. vars = { 'chromium_git': 'https://chromium.googlesource.com', @@ -431,16 +445,6 @@ 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 02071d2e72d7e..f65028e32b258 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 8657ee54922fa27c46d6c88773a1431d +Signature: ba62ed10d5e046f90a397663d6c9d5d2 diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index e8afee3c5d1fd..7a5d25c230a04 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -1497,16 +1497,6 @@ 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); @@ -1868,8 +1858,6 @@ 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')