diff options
| author | Ivan Gavrilovic <gavra@google.com> | 2017-09-08 11:40:54 +0100 |
|---|---|---|
| committer | Ivan Gavrilovic <gavra@google.com> | 2017-09-08 11:40:54 +0100 |
| commit | 4de512e03895a6a0807f3995e4fa4bd7023ebaf9 (patch) | |
| tree | 37c01c8ecfcf31769cfd00e963d83c7b9dd7c133 /src/main/java/com/android/tools/r8/compatdx/CompatDxCommandBuilder.java | |
| parent | e2e57e78f1478d15d7aedb565f1f141907185918 (diff) | |
| parent | 0524d7eaff7f277fa13c0568f75498642a21089e (diff) | |
| download | r8-4de512e03895a6a0807f3995e4fa4bd7023ebaf9.tar.gz | |
Merge remote-tracking branch 'goog/upstream-d8-0.1' into studio-master-canary
* goog/upstream-d8-0.1:
Version 0.1.11.
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); } } |