Android: Update desugar tool to 1.1.0

Rolling this tool just to keep it up-to-date.
Also want to try out new flag in a follow-up:
  --generate_base_classes_for_default_methods

Change-Id: Ia357a27b9ed8064a4adb8abc00ce0c4c601972a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1882306
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712463}

DEPS

@@ -795,7 +795,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/bazel',
-              'version': '1794576f65a721eb0af320a0701e48d31f1b2415',
+              'version': 'tQPvsIj1Gtw5iXssKy7OREE-S02u7zItrw42l3DHUroC',
           },
       ],
       'condition': 'checkout_android',

third_party/.gitignore

@@ -40,7 +40,7 @@
 /arcore-android-sdk/test-apks/arcore/*.apk
 /asan
 /auto/src
-/bazel/desugar/Desugar.jar
+/bazel/desugar/*.jar
 /bison
 /boringssl/src
 /bouncycastle/lib/

third_party/bazel/cipd.yaml

@@ -5,3 +5,4 @@
 package: chromium/third_party/bazel
 data:
   - file: desugar/Desugar.jar
+  - file: desugar/Desugar_runtime.jar

third_party/bazel/desugar/BUILD.gn

@@ -7,6 +7,6 @@ import("//build/config/android/rules.gni")
 # Provides runtime support for desugar transformations.
 java_prebuilt("desugar_runtime_java") {
   supports_android = true
-  jar_path = "Desugar-runtime.jar"
+  jar_path = "Desugar_runtime.jar"
   no_build_hooks = true
 }

third_party/bazel/desugar/README.chromium

 Name: Desugar, transforming Java 8 bytecode to be Java 7 compatible
 Short Name: desugar
-URL: It's part of Bazel build system (https://github.com/bazelbuild/bazel).
-     Also, go/desugar for @google.com account owners
-Version: 0.10.0
-Date: Feb 1, 2018
+URL: https://github.com/bazelbuild/bazel
+Version: 1.1.0
 License: Apache 2.0
 Security Critical: no
 
@@ -12,11 +10,12 @@ Desugar is a Google-developed open-source Java library used by the build process
 to transform Java 8 bytecode to Java 7. It is used to enable Java 8 features
 such as lambda experssions for Chrome on Android.
 
+Googlers: See: go/desugar
+
 Local Modifications:
-* Desugar.jar is the "Desugar_deploy.jar" target defined in
-  [bazel]src/tools/android/java/com/google/devtools/build/android/desugar/BUILD
-* Desugar-runtime.jar is derived from Desugar.jar (refer to update
-  instructions).
+* Added BUILD.gn, proguard.flags.
+* Desugar_deploy.jar split into Desugar.jar and Desugar_runtime.jar.
+* Desugar.jar has been run through r8.jar to remove unused .class files.
 
 Update instructions (requires @google.com account for uploading):
 * Check out Bazel from https://github.com/bazelbuild/bazel
@@ -27,17 +26,18 @@ Update instructions (requires @google.com account for uploading):
 * Move Desugar_deploy.jar to location within Chromium:
     rm $CHROMIUM_SRC/third_party/bazel/desugar/Desugar.jar
     mv bazel-bin/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar_deploy.jar $CHROMIUM_SRC/third_party/bazel/desugar/Desugar.jar
-* Update Desugar-runtime.jar:
+* Update Desugar_runtime.jar:
     unzip Desugar.jar "com/google/devtools/build/android/desugar/runtime*"
-    zip -rD0 Desugar-runtime.jar com
+    zip -rD0 Desugar_runtime.jar com
     rm -r com
+* Shrink via r8 (optional - reduces size by about 66%).
+    java -jar ../../r8/lib/r8.jar --debug --classfile --output Desugar.new.jar --pg-conf proguard.flags --no-desugaring --lib ../../jdk/extras/java_8/jre/lib/rt.jar Desugar.jar
+    mv Desugar.new.jar Desugar.jar
 * Perform a sanity check of chrome_public_apk:
     ninja chrome_public_apk
     bin/chrome_public_apk run
-* Update this README.chromium (Version & Date)
+* Update this README.chromium (Version)
 * Upload new jar to CIPD:
     cd third_party/bazel
-    VERSION=$(grep Version -m1 desugar/README.chromium | cut -d' ' -f2)
-    cipd create --pkg-def cipd.yaml -tag version:$VERSION
-* Update revision in //build/cipd/android/android.ensure (soon to be right in
-  //DEPS)
+    cipd create --pkg-def cipd.yaml
+* Update revision //DEPS

third_party/bazel/desugar/proguard.flags

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+-dontoptimize
+-dontobfuscate
+-keepattributes *
+-dontwarn *
+
+-keep class com.google.devtools.** {
+  *;
+}