summaryrefslogtreecommitdiff
path: root/android-gradle-jps
diff options
context:
space:
mode:
authorChris Warrington <cmw@google.com>2015-01-26 15:14:01 -0800
committerChris Warrington <cmw@google.com>2015-01-27 15:49:02 -0800
commit8c96822ef66641ee5fc8d65092f4b37e32c0b085 (patch)
tree070f6e501ba37fa5c65032b698957d8d8bf6556a /android-gradle-jps
parent338ae19f8d68e972f1b02a55162e41623a4789ee (diff)
downloadidea-8c96822ef66641ee5fc8d65092f4b37e32c0b085.tar.gz
Move AAPT parser from studio to gradle.
Allows rewriting of AAPT error messages in the Gradle plugin. Moved from android-common to sdk-common. Change-Id: I0aa722232cb1b80c40256c0266177cb8bfe867cd
Diffstat (limited to 'android-gradle-jps')
-rw-r--r--android-gradle-jps/src/com/android/tools/idea/jps/AndroidGradleJps.java2
-rw-r--r--android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/android-gradle-jps/src/com/android/tools/idea/jps/AndroidGradleJps.java b/android-gradle-jps/src/com/android/tools/idea/jps/AndroidGradleJps.java
index 0d86a7bf163..4c7e0ed9e36 100644
--- a/android-gradle-jps/src/com/android/tools/idea/jps/AndroidGradleJps.java
+++ b/android-gradle-jps/src/com/android/tools/idea/jps/AndroidGradleJps.java
@@ -15,7 +15,7 @@
*/
package com.android.tools.idea.jps;
-import com.android.tools.idea.gradle.output.GradleMessage;
+import com.android.ide.common.blame.output.GradleMessage;
import com.android.tools.idea.jps.model.JpsAndroidGradleModuleExtension;
import com.android.tools.idea.jps.model.JpsGradleModuleExtension;
import com.android.tools.idea.jps.model.impl.JpsAndroidGradleModuleExtensionImpl;
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 9d71a2e0e9c..1b10865308f 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
@@ -16,7 +16,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.ide.common.blame.output.GradleMessage;
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;