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

RELNOTES: None PiperOrigin-RevId: 193562885
s-pace · Apr 19, 2018 · e6b9c2a · e6b9c2a
1 parent ae25202
commit e6b9c2a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
@@ -174,6 +174,7 @@ public static void main(String[] args) throws Exception {
               .buildVersion(aaptConfigOptions.buildToolsVersion)
               .conditionalKeepRules(aaptConfigOptions.conditionalKeepRules == TriState.YES)
               .filterToDensity(options.densities)
+              .debug(aaptConfigOptions.debug)
               .includeOnlyConfigs(aaptConfigOptions.resourceConfigs)
               .link(compiled)
               .copyPackageTo(options.packagePath)

diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java
@@ -111,6 +111,7 @@ public static void main(String[] args) throws Exception {
           .outputAsProto(aapt2ConfigOptions.resourceTableAsProto)
           .buildVersion(aapt2ConfigOptions.buildToolsVersion)
           .includeOnlyConfigs(aapt2ConfigOptions.resourceConfigs)
+          .debug(aapt2ConfigOptions.debug)
           .link(compiled)
           .copyPackageTo(options.shrunkApk)
           .copyRTxtTo(options.rTxtOutput);

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
@@ -47,6 +47,9 @@
 
 /** 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 ResourceLinker buildVersion(Revision buildToolsVersion) {
     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 PackagedResources link(CompiledResources compiled) {
               .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)