diff options
| author | Alex Ruiz <alruiz@google.com> | 2014-06-05 17:07:04 -0700 |
|---|---|---|
| committer | Alex Ruiz <alruiz@google.com> | 2014-06-06 12:56:56 -0700 |
| commit | fe96831658c9d2cb945d194f0d053d141ddb8682 (patch) | |
| tree | 49ace43274c6c54004e80b7dc3eef2734c29e254 /android-gradle-jps | |
| parent | 0e1ba5c73dc67af052529c8f875f4c72d7e2699d (diff) | |
| download | idea-fe96831658c9d2cb945d194f0d053d141ddb8682.tar.gz | |
Added support for parsing structured messages coming from Android Gradle plug-in.
In this CL, we invoke Gradle passing the JVM arg
"android.invoked.from.ide". The Android Gradle plug-in,
when detecting this argument, will format any
warning/error messages using the pattern:
message_type|gradle_project_path|message
As part of this CL, we parse this output, create
the appropriate message for the "Messages" window
and link to the build.gradle file in the module
with a matching Gradle path.
This CL also fixes broken tests in BuildOutputParserTest.
Change-Id: I2912467ef5dfcb2f5b7923d3c5290feda5613595
Diffstat (limited to 'android-gradle-jps')
| -rw-r--r-- | android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java | 3 |
1 files changed, 3 insertions, 0 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 af0b8165662..b8a1b8d621d 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 @@ -15,6 +15,7 @@ */ package com.android.tools.idea.jps.builder; +import com.android.builder.model.AndroidProject; import com.android.tools.idea.gradle.output.GradleMessage; import com.android.tools.idea.gradle.output.parser.BuildOutputParser; import com.android.tools.idea.gradle.util.AndroidGradleSettings; @@ -305,6 +306,8 @@ public class AndroidGradleTargetBuilder extends TargetBuilder<AndroidGradleBuild jvmArgs.add(arg); } + jvmArgs.add(AndroidGradleSettings.createJvmArg(AndroidProject.INVOKED_FROM_IDE_PROPERTY, true)); + if (androidHome != null && !androidHome.isEmpty()) { String androidSdkArg = AndroidGradleSettings.createAndroidHomeJvmArg(androidHome); jvmArgs.add(androidSdkArg); |