aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools
diff options
context:
space:
mode:
authorGravatar jingwen <jingwen@google.com>2018-05-21 18:10:16 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-05-21 18:11:50 -0700
commite33708407e79b3e2c2b8bdab757d701b8318fea8 (patch)
tree19104bff8db68cd7ee9b002857329a217f3d0de6 /src/tools
parenta08bfba65f6f7f5c382a5b90e55f7c468dde3275 (diff)
Send Aapt2Exception message to the logger.
Currently, if there are non-suppressed errors during aapt2 processing, Bazel does not print them. This helps with debugging https://github.com/bazelbuild/bazel/pull/5222 With this, I get: ``` ERROR: /usr/local/google/home/jingwen/code/android_scratch_project/examples/android/java/bazel/BUILD:16:1: Processing Android resources for //examples/android/java/bazel:hello_world failed (Exit 1) May 21, 2018 5:31:01 PM com.google.devtools.build.android.ResourceProcessorBusyBox main SEVERE: java.io.IOException: Is a directory Target //examples/android/java/bazel:hello_world failed to build ``` instead of just: ``` ERROR: /usr/local/google/home/jingwen/code/android_scratch_project/examples/android/java/bazel/BUILD:16:1: Processing Android resources for //examples/android/java/bazel:hello_world failed (Exit 1) Target //examples/android/java/bazel:hello_world failed to build ``` RELNOTES: None. PiperOrigin-RevId: 197493881
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
index 32a17e7ddd..f22dec2740 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java
@@ -191,11 +191,9 @@ public class ResourceProcessorBusyBox {
Options options = optionsParser.getOptions(Options.class);
try {
options.tool.call(optionsParser.getResidue().toArray(new String[0]));
- } catch (MergingException | IOException e) {
+ } catch (MergingException | IOException | Aapt2Exception e) {
logger.severe(e.getMessage());
logSuppressedAndExit(e);
- } catch (Aapt2Exception e) {
- logSuppressedAndExit(e);
}
}