Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 589b6a2

Browse files
authored
Add bundletool to DEPS and remove outdated header comment (#28040)
1 parent 3f4d43c commit 589b6a2

File tree

3 files changed

+26
-18
lines changed

3 files changed

+26
-18
lines changed

DEPS

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1-
# This file is automatically processed to create .DEPS.git which is the file
2-
# that gclient uses under git.
1+
# This file contains the dependencies used by the Engine repo.
32
#
4-
# See http://code.google.com/p/chromium/wiki/UsingGit
5-
#
6-
# To test manually, run:
7-
# python tools/deps2git/deps2git.py -o .DEPS.git -w <gclientdir>
8-
# where <gcliendir> is the absolute path to the directory containing the
9-
# .gclient file (the parent of 'src').
10-
#
11-
# Then commit .DEPS.git locally (gclient doesn't like dirty trees) and run
12-
# gclient sync..
13-
# Verify the thing happened you wanted. Then revert your .DEPS.git change
14-
# DO NOT CHECK IN CHANGES TO .DEPS.git upstream. It will be automatically
15-
# updated by a bot when you modify this one.
16-
#
17-
# When adding a new dependency, please update the top-level .gitignore file
18-
# to list the dependency's destination directory.
3+
# Use the `gclient sync` command to download and sync local checkouts
4+
# with the versions listed in this file.
195

206
vars = {
217
'chromium_git': 'https://chromium.googlesource.com',
@@ -445,6 +431,16 @@ deps = {
445431
'src/third_party/pkg/when':
446432
Var('dart_git') + '/when.git' + '@' + '0.2.0',
447433

434+
'src/third_party/bundletool': {
435+
'packages': [
436+
{
437+
'package': 'flutter/android/bundletool',
438+
'version': 'version:1.7.1.1'
439+
}
440+
],
441+
'dep_type': 'cipd',
442+
},
443+
448444
'src/third_party/android_tools/ndk': {
449445
'packages': [
450446
{

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: ba62ed10d5e046f90a397663d6c9d5d2
1+
Signature: 8657ee54922fa27c46d6c88773a1431d
22

tools/licenses/lib/main.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,6 +1497,16 @@ class _RepositoryIcuDirectory extends _RepositoryDirectory {
14971497
}
14981498
}
14991499

1500+
class _RepositoryBundletoolDirectory extends _RepositoryDirectory {
1501+
_RepositoryBundletoolDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
1502+
1503+
@override
1504+
bool shouldRecurse(fs.IoNode entry) {
1505+
return entry.name != 'bundletool.jar' // redundant with LICENSE file
1506+
&& super.shouldRecurse(entry);
1507+
}
1508+
}
1509+
15001510
class _RepositoryHarfbuzzDirectory extends _RepositoryDirectory {
15011511
_RepositoryHarfbuzzDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
15021512

@@ -1858,6 +1868,8 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
18581868
return _RepositoryHarfbuzzDirectory(this, entry);
18591869
if (entry.name == 'icu')
18601870
return _RepositoryIcuDirectory(this, entry);
1871+
if (entry.name == 'bundletool')
1872+
return _RepositoryBundletoolDirectory(this, entry);
18611873
if (entry.name == 'jsr-305')
18621874
return _RepositoryJSR305Directory(this, entry);
18631875
if (entry.name == 'libcxx')

0 commit comments

Comments
 (0)