Version 2.0.29
Fix merge issues in version 2.0.28.
AppInfoWithSubtyping was replaced with AppInfoWithClassHierarchy
on master. For the specific use-case AppInfo was sufficient.
Construction of Timing objects was changed on master.
Bug: 140368601
Bug: 140367927
Change-Id: Iae3f2cb7486904b5f48a0e8180a95701ea601b1f
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index b3252ab..8e81cfe 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 = "2.0.28";
+ public static final String LABEL = "2.0.29";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
index 5d1671b..1dce2ed 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
@@ -10,7 +10,6 @@
import com.android.tools.r8.dex.Constants;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.AppInfo;
-import com.android.tools.r8.graph.AppInfoWithClassHierarchy;
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.ClassAccessFlags;
import com.android.tools.r8.graph.Code;
@@ -95,15 +94,12 @@
try {
List<DexMethod> methods = new ArrayList<>();
PrefixRewritingMapper rewritePrefix =
- options.desugaredLibraryConfiguration.createPrefixRewritingMapper(options);
+ options.desugaredLibraryConfiguration.createPrefixRewritingMapper(options.itemFactory);
AppInfo appInfo = null;
if (androidApp != null) {
DexApplication app =
- new ApplicationReader(androidApp, options, Timing.empty()).read(executor);
- appInfo =
- options.desugaredLibraryConfiguration.getRewritePrefix().isEmpty()
- ? new AppInfo(app)
- : new AppInfoWithClassHierarchy(app);
+ new ApplicationReader(androidApp, options, new Timing()).read(executor);
+ appInfo = new AppInfo(app);
}
AppView<?> appView = AppView.createForD8(appInfo, options, rewritePrefix);
BackportedMethodRewriter.RewritableMethods rewritableMethods =
