Revert "Update bundletools to version 1.4.0"

This reverts commit 3031091. Reason for revert: 1152140 Original change's description: > Update bundletools to version 1.4.0 > > Bug: 1151352 > Change-Id: I2a117e5f6cb3bf1b08f7f9f68cea7e4a893db6fb > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2553852 > Commit-Queue: Mohamed Heikal <mheikal@chromium.org> > Commit-Queue: Peter Wen <wnwen@chromium.org> > Auto-Submit: Mohamed Heikal <mheikal@chromium.org> > Reviewed-by: Peter Wen <wnwen@chromium.org> > Cr-Commit-Position: refs/heads/master@{#830240} TBR=wnwen@chromium.org,mheikal@chromium.org Change-Id: Ia1f6954b49d418437f3dc2f0e457e0a470842132 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1151352 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2556358 Reviewed-by: Shimi Zhang <ctzsm@chromium.org> Commit-Queue: Shimi Zhang <ctzsm@chromium.org> Cr-Commit-Position: refs/heads/master@{#830392}
marcosholgado · Nov 24, 2020 · 130fbc7 · 130fbc7
1 parent a2ef183
commit 130fbc7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/DEPS b/DEPS
@@ -747,7 +747,7 @@ deps = {
       'packages': [
           {
                'package': 'chromium/third_party/android_tools_bundletool',
-               'version': 'FIj7ed-law2zMv41QhjEXabkaJ7aN2ztmE0Tv3Z_gFUC',
+               'version': 'gB66fGCdzqmQO6U6hxhoZDCGjOg-oqxhT_4uywaUw1oC',
           },
       ],
       'condition': 'checkout_android',

diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
@@ -68,7 +68,7 @@ group("apk_installer_data") {
       "//tools/android/md5sum",
     ]
     data = [
-      "//third_party/android_build_tools/bundletool/bundletool-all-1.4.0.jar",
+      "//third_party/android_build_tools/bundletool/bundletool-all-1.2.0.jar",
     ]
   }
 }

diff --git a/build/android/devil_chromium.json b/build/android/devil_chromium.json
@@ -111,7 +111,7 @@
       "file_info": {
         "default": {
           "local_paths": [
-            "../../third_party/android_build_tools/bundletool/bundletool-all-1.4.0.jar"
+            "../../third_party/android_build_tools/bundletool/bundletool-all-1.2.0.jar"
           ]
         }
       }

diff --git a/build/android/gyp/bundletool.py b/build/android/gyp/bundletool.py
@@ -19,7 +19,7 @@
     __file__, '..', '..', '..', '..', 'third_party', 'android_build_tools',
     'bundletool'))
 
-BUNDLETOOL_VERSION = '1.4.0'
+BUNDLETOOL_VERSION = '1.2.0'
 
 BUNDLETOOL_JAR_PATH = os.path.join(
     BUNDLETOOL_DIR, 'bundletool-all-%s.jar' % BUNDLETOOL_VERSION)

diff --git a/third_party/android_build_tools/bundletool/README.chromium b/third_party/android_build_tools/bundletool/README.chromium
@@ -1,6 +1,6 @@
 Name: Android SDK bundletool
 Short Name:  bundletool
-Version: 1.4.0
+Version: 1.2.0
 License: Apache Version 2.0
 License File: NOT_SHIPPED
 Security Critical: No

diff --git a/third_party/android_build_tools/bundletool/cipd.yaml b/third_party/android_build_tools/bundletool/cipd.yaml
@@ -10,4 +10,4 @@ description: Android SDK tool to manage App Bundles
 # swarming isolation works properly with symlinks.
 install_mode: copy
 data:
-  - file: bundletool-all-1.4.0.jar
+  - file: bundletool-all-1.2.0.jar