From 0524d7eaff7f277fa13c0568f75498642a21089e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= Date: Fri, 8 Sep 2017 11:50:44 +0200 Subject: Version 0.1.11. This merges changes to the internals of the D8 API. This will ensure binary compatibility with the current master. There are no functional changes. Merge: Fix CompatDX's ignoreDexInArchieve CL: https://r8-review.googlesource.com/c/r8/+/4580 Merge: Add the option of providing Proguard configuration from strings CL: https://r8-review.googlesource.com/c/r8/+/5562 Merge: Reapply "Add a separate tool for computing the main-dex list" CL: https://r8-review.googlesource.com/c/r8/+/5680 Change-Id: I77535512993eb0f34ecd3312103bc568734d8a4e --- src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java') diff --git a/src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java b/src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java index ba9daece5..55206a407 100644 --- a/src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java +++ b/src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java @@ -8,6 +8,6 @@ import com.android.tools.r8.D8Command; public class CompatDxCommandBuilder extends D8Command.Builder { CompatDxCommandBuilder() { - ignoreDexInArchive = true; + super(true); } } -- cgit v1.2.3