diff options
| author |  corysmith <corysmith@google.com> | 2018-04-19 13:12:29 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-19 13:13:45 -0700 |
| commit | e6b9c2a7d5cfa7d6a405ac02b381b6ebd08d2043 (patch) | |
| tree | 33ec56e9b83d2e3c2d0b36e7fc211aae0ad6a7e4 /src/tools | |
| parent | ae25202c65ebda4c7d4b083a8fe5edef20daa910 (diff) | |
Add --debug-mode to aapt2 invocations when building without -c opt.
RELNOTES: None
PiperOrigin-RevId: 193562885
Diffstat (limited to 'src/tools')
3 files changed, 12 insertions, 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 index eace6b6dda..3ec965067b 100644 --- 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 class Aapt2ResourcePackagingAction { .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 index d515fbbe3b..af2a98ab2f 100644 --- 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 class Aapt2ResourceShrinkingAction { .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 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) |