summaryrefslogtreecommitdiff
path: root/android-gradle-jps
diff options
context:
space:
mode:
authornik <Nikolay.Chashnikov@jetbrains.com>2015-03-13 14:57:15 +0300
committerTor Norbye <tnorbye@google.com>2015-03-17 08:18:21 -0700
commit615acf9ae742caa81ccff49dc17610f6d636f83c (patch)
tree224530186220947978a12def8fda39d871b149b4 /android-gradle-jps
parent5689bd08d7dfb781c0dc0286c2736ccc3344e1df (diff)
downloadidea-615acf9ae742caa81ccff49dc17610f6d636f83c.tar.gz
gradle output parser for Android projects: allow plugins to provide their own parsers (restored)
(cherry picked from commit 117a087, rev by Vlad)
Diffstat (limited to 'android-gradle-jps')
-rw-r--r--android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java
index f297beafa08..673a1591cd3 100644
--- a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java
+++ b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java
@@ -17,6 +17,7 @@ package com.android.tools.idea.jps.builder;
import com.android.builder.model.AndroidProject;
import com.android.ide.common.blame.output.GradleMessage;
+import com.android.ide.common.blame.parser.PatternAwareOutputParser;
import com.android.tools.idea.gradle.output.parser.BuildOutputParser;
import com.android.tools.idea.gradle.util.AndroidGradleSettings;
import com.android.tools.idea.gradle.util.BuildMode;
@@ -294,7 +295,8 @@ public class AndroidGradleTargetBuilder extends TargetBuilder<AndroidGradleBuild
* "Problems" view. The idea is that we need to somehow inform the user that something went wrong.
*/
private static void handleBuildException(BuildException e, CompileContext context, String stdErr) throws ProjectBuildException {
- Collection<GradleMessage> compilerMessages = new BuildOutputParser().parseGradleOutput(stdErr);
+ Iterable<PatternAwareOutputParser> parsers = JpsServiceManager.getInstance().getExtensions(PatternAwareOutputParser.class);
+ Collection<GradleMessage> compilerMessages = new BuildOutputParser(parsers).parseGradleOutput(stdErr);
if (!compilerMessages.isEmpty()) {
boolean hasError = false;
for (GradleMessage message : compilerMessages) {