Add --debug-mode to aapt2 invocations when building without -c opt.

RELNOTES: None
PiperOrigin-RevId: 193562885

1 files changed, 10 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
index d7d1ad13d7..c2bfc60abe 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java
@@ -47,6 +47,9 @@ import java.util.stream.Stream;
 
 /** Performs linking of {@link CompiledResources} using aapt2. */
 public class ResourceLinker {
+
+  private boolean debug;
+
   /** Represents errors thrown during linking. */
   public static class LinkError extends Aapt2Exception {
 
@@ -122,6 +125,11 @@ public class ResourceLinker {
     return this;
   }
 
+  public ResourceLinker debug(boolean debug) {
+    this.debug = debug;
+    return this;
+  }
+
   public ResourceLinker conditionalKeepRules(boolean conditionalKeepRules) {
     this.conditionalKeepRules = conditionalKeepRules;
     return this;
@@ -310,6 +318,8 @@ public class ResourceLinker {
               .add("--manifest", compiled.getManifest())
               // Enables resource redefinition and merging
               .add("--auto-add-overlay")
+              .when(debug)
+              .thenAdd("--debug-mode")
               .add("--custom-package", customPackage)
               .when(densities.size() == 1)
               .thenAddRepeated("--preferred-density", densities)