| commit | bc9488815ac0b46d06ed2893635c42f2adc0ab17 | [log] [tgz] |
|---|---|---|
| author | Morten Krogh-Jespersen <mkroghj@google.com> | Tue Mar 22 08:09:13 2022 +0100 |
| committer | Morten Krogh-Jespersen <mkroghj@google.com> | Tue Mar 22 08:09:13 2022 +0100 |
| tree | 02178a99757e6952e08e8384466e8685ba6ebff5 | |
| parent | c32f6c9716e0e81e9b580b4cf41cada9c103b949 [diff] |
[Retrace] Add @Keep to MappingProviderBuilder Also remove dead file Change-Id: I5b69abbc8e525049a3fd5ce39754e1c27a2a6f69
diff --git a/src/main/java/com/android/tools/r8/retrace/MappingProviderBuilder.java b/src/main/java/com/android/tools/r8/retrace/MappingProviderBuilder.java index 999cf34..f9dbd492 100644 --- a/src/main/java/com/android/tools/r8/retrace/MappingProviderBuilder.java +++ b/src/main/java/com/android/tools/r8/retrace/MappingProviderBuilder.java
@@ -5,7 +5,9 @@ package com.android.tools.r8.retrace; import com.android.tools.r8.DiagnosticsHandler; +import com.android.tools.r8.Keep; +@Keep public abstract class MappingProviderBuilder< P extends MappingProvider, T extends MappingProviderBuilder<P, T>> {
diff --git a/src/main/java/com/android/tools/r8/retrace/ProguardMappingProviderBuilder.java b/src/main/java/com/android/tools/r8/retrace/ProguardMappingProviderBuilder.java deleted file mode 100644 index bac11fe..0000000 --- a/src/main/java/com/android/tools/r8/retrace/ProguardMappingProviderBuilder.java +++ /dev/null
@@ -1,5 +0,0 @@ -// Copyright (c) 2022, the R8 project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -package com.android.tools.r8.retrace;
diff --git a/src/main/java/com/android/tools/r8/retrace/Retracer.java b/src/main/java/com/android/tools/r8/retrace/Retracer.java index e7f3620..9a4eadf 100644 --- a/src/main/java/com/android/tools/r8/retrace/Retracer.java +++ b/src/main/java/com/android/tools/r8/retrace/Retracer.java
@@ -82,8 +82,8 @@ .setMappingProvider(mappingProvider) .setDiagnosticsHandler(diagnosticsHandler) .build(); - } catch (Throwable throwable) { - throw new InvalidMappingFileException(throwable); + } catch (Exception e) { + throw new InvalidMappingFileException(e); } }
diff --git a/third_party/retrace/binary_compatibility.tar.gz.sha1 b/third_party/retrace/binary_compatibility.tar.gz.sha1 index a6c6552..431fdbe 100644 --- a/third_party/retrace/binary_compatibility.tar.gz.sha1 +++ b/third_party/retrace/binary_compatibility.tar.gz.sha1
@@ -1 +1 @@ -b894dcd6f56232215d34167274fe15ab23f88a09 \ No newline at end of file +2ebfdd6c7d270471cb38baa355d5d137af2f7dd1 \ No newline at end of file