| commit | 6a4e7c1dc82838cefc5ef5964186fa088ad9bee1 | [log] [tgz] |
|---|---|---|
| author | Rico Wind <ricow@google.com> | Thu May 23 08:47:28 2019 +0200 |
| committer | Rico Wind <ricow@google.com> | Thu May 23 08:47:28 2019 +0200 |
| tree | 220c0dfa6dd577318781b87c71c7d4d7ca4ddb0c | |
| parent | 657d11be7f8412156e86280d2c59b79e6fad4755 [diff] |
Version 1.5.34 Cherry pick: Use a set when calling removeAll CL: https://r8-review.googlesource.com/c/r8/+/38233 Bug: 132420434 Change-Id: I5a615d3f001e6c5af79be5506d4bdda1a67b7303
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index d9a92af..1027b71 100644 --- a/src/main/java/com/android/tools/r8/Version.java +++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@ // This field is accessed from release scripts using simple pattern matching. // Therefore, changing this field could break our release scripts. - public static final String LABEL = "1.5.33"; + public static final String LABEL = "1.5.34"; private Version() { }
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java index 2501f9f..b52762a 100644 --- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java +++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -317,7 +317,7 @@ pinnedItems.stream() .filter(DexReference::isDexField) .map(DexReference::asDexField) - .collect(Collectors.toList())); + .collect(Collectors.toSet())); return result; }