From af8932b5c2fecbe9f7e935691024de08c2441e09 Mon Sep 17 00:00:00 2001
From: garyqian <garyq@google.com>
Date: Thu, 12 Aug 2021 11:51:05 +0200
Subject: [PATCH 1/5] Add bundletool deps and remove outdated header comment

---
 DEPS | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/DEPS b/DEPS
index d082ec104c296..b092b1b7dbec8 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 <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',
@@ -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'
+       }
+     ],
+     'dep_type': 'cipd',
+   },
+
   'src/third_party/android_tools/ndk': {
      'packages': [
        {

From 263aa5d94abba1754d496661dd5f8209d05402bd Mon Sep 17 00:00:00 2001
From: garyqian <garyq@google.com>
Date: Thu, 12 Aug 2021 12:38:05 +0200
Subject: [PATCH 2/5] Add License

---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index b092b1b7dbec8..2ba7ea03b6f47 100644
--- a/DEPS
+++ b/DEPS
@@ -435,7 +435,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/bundletool',
-        'version': 'version:1.7.1'
+        'version': 'version:1.7.1.1'
        }
      ],
      'dep_type': 'cipd',

From 6e73faea17d52f1b1573162b59b2d957d667d3d8 Mon Sep 17 00:00:00 2001
From: garyqian <garyq@google.com>
Date: Mon, 16 Aug 2021 16:22:01 -0700
Subject: [PATCH 3/5] License script

---
 tools/licenses/lib/main.dart | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
index 7a5d25c230a04..e8afee3c5d1fd 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')

From efc816a376f07c38e9f895344267fcdfc05b5394 Mon Sep 17 00:00:00 2001
From: garyqian <garyq@google.com>
Date: Mon, 16 Aug 2021 16:56:26 -0700
Subject: [PATCH 4/5] Update golden

---
 ci/licenses_golden/tool_signature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index f65028e32b258..f313cbe80e2db 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: ba62ed10d5e046f90a397663d6c9d5d2
+Signature: c74d92f352b4f0ae5ef7f45d2358846f
 

From da5518776b68bbdf5d82ac124c0996523048e53a Mon Sep 17 00:00:00 2001
From: garyqian <garyq@google.com>
Date: Mon, 16 Aug 2021 17:34:08 -0700
Subject: [PATCH 5/5] tool hash

---
 ci/licenses_golden/tool_signature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index f313cbe80e2db..02071d2e72d7e 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: c74d92f352b4f0ae5ef7f45d2358846f
+Signature: 8657ee54922fa27c46d6c88773a1431d