commit 8ac42f1e380c62425c249c2e1d984f2457340880
author Søren Gjesse <sgjesse@google.com> Tue Jun 19 06:49:52 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 19 06:49:52 2018 +0000
tree 93a873a28e60368881410a23b5d53a521238f935
parent 04beb44a77c7c98a780803319974be9b65520b47
parent 368c622b31a879a9e51a71f450cb40fd2c0f0eb6

Merge "Make Proguard -dontobfuscate option turn on debug mode in R8"

src/main/java/com/android/tools/r8/R8Command.java

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index 86ff5a5..9fcca89 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -531,7 +531,8 @@
   InternalOptions getInternalOptions() {
     InternalOptions internal = new InternalOptions(proguardConfiguration, getReporter());
     assert !internal.debug;
-    internal.debug = getMode() == CompilationMode.DEBUG;
+    internal.debug = getMode() == CompilationMode.DEBUG
+        || (forceProguardCompatibility && !proguardConfiguration.isObfuscating());
     internal.programConsumer = getProgramConsumer();
     internal.minApiLevel = getMinApiLevel();
     internal.enableDesugaring = getEnableDesugaring();