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

Commit 159ea6b

Browse files
authored
Revert "Add bundletool to DEPS and remove outdated header comment (#28040)" (#28128)
This reverts commit 589b6a2.
1 parent 8945280 commit 159ea6b

File tree

3 files changed

+18
-26
lines changed

3 files changed

+18
-26
lines changed

DEPS

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
# This file contains the dependencies used by the Engine repo.
1+
# This file is automatically processed to create .DEPS.git which is the file
2+
# that gclient uses under git.
23
#
3-
# Use the `gclient sync` command to download and sync local checkouts
4-
# with the versions listed in this file.
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.
519

620
vars = {
721
'chromium_git': 'https://chromium.googlesource.com',
@@ -431,16 +445,6 @@ deps = {
431445
'src/third_party/pkg/when':
432446
Var('dart_git') + '/when.git' + '@' + '0.2.0',
433447

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-
444448
'src/third_party/android_tools/ndk': {
445449
'packages': [
446450
{

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: 8657ee54922fa27c46d6c88773a1431d
1+
Signature: ba62ed10d5e046f90a397663d6c9d5d2
22

tools/licenses/lib/main.dart

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,16 +1497,6 @@ 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-
15101500
class _RepositoryHarfbuzzDirectory extends _RepositoryDirectory {
15111501
_RepositoryHarfbuzzDirectory(_RepositoryDirectory parent, fs.Directory io) : super(parent, io);
15121502

@@ -1868,8 +1858,6 @@ class _RepositoryRootThirdPartyDirectory extends _RepositoryGenericThirdPartyDir
18681858
return _RepositoryHarfbuzzDirectory(this, entry);
18691859
if (entry.name == 'icu')
18701860
return _RepositoryIcuDirectory(this, entry);
1871-
if (entry.name == 'bundletool')
1872-
return _RepositoryBundletoolDirectory(this, entry);
18731861
if (entry.name == 'jsr-305')
18741862
return _RepositoryJSR305Directory(this, entry);
18751863
if (entry.name == 'libcxx')

0 commit comments

Comments
 (0)