diff options
| author | Søren Gjesse <sgjesse@google.com> | 2017-09-08 11:50:44 +0200 |
|---|---|---|
| committer | Søren Gjesse <sgjesse@google.com> | 2017-09-08 11:50:44 +0200 |
| commit | 0524d7eaff7f277fa13c0568f75498642a21089e (patch) | |
| tree | 904caa51491dd67ec2ae6b897b091e9291c1c87d /src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java | |
| parent | 0de28fa0e7e057e1f531b85d93774165e082402f (diff) | |
| download | r8-0524d7eaff7f277fa13c0568f75498642a21089e.tar.gz | |
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
Diffstat (limited to 'src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java')
| -rw-r--r-- | src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |