diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-04-24 10:43:41 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-04-24 10:43:41 -0700 |
| commit | b17587c84879dd2ea42495f1fbdadbc806b9475b (patch) | |
| tree | b4d9014f69cb8289627ddc75339a6b0b3fe1bc5e /plugins/android | |
| parent | b569bc6aa78f6eacf72e8b90622d300e1a9db25f (diff) | |
| download | idea-b17587c84879dd2ea42495f1fbdadbc806b9475b.tar.gz | |
Snapshot e242282deb41c328afbe971fc167e47ddfb26df9 from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Ifdc1818cde7b63f6d7bf42801f18c7f1557b8d85
Diffstat (limited to 'plugins/android')
| -rw-r--r-- | plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java | 7 | ||||
| -rw-r--r-- | plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java | 11 |
2 files changed, 6 insertions, 12 deletions
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java index a3f1429da95c..dd06b93a89e4 100644 --- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java +++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java @@ -39,10 +39,7 @@ import org.jetbrains.jps.builders.BuildOutputConsumer; import org.jetbrains.jps.builders.BuildRootDescriptor; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.cmdline.ClasspathBootstrap; -import org.jetbrains.jps.incremental.CompileContext; -import org.jetbrains.jps.incremental.ExternalProcessUtil; -import org.jetbrains.jps.incremental.ProjectBuildException; -import org.jetbrains.jps.incremental.TargetBuilder; +import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; import org.jetbrains.jps.incremental.messages.ProgressMessage; @@ -77,7 +74,7 @@ public class AndroidDexBuilder extends TargetBuilder<BuildRootDescriptor, Androi try { if (!doDexBuild(buildTarget, context, holder.hasDirtyFiles())) { - throw new ProjectBuildException(); + throw new StopBuildException(); } } catch (ProjectBuildException e) { diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java index b417740b769d..533957f0cca5 100644 --- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java +++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java @@ -22,10 +22,7 @@ import org.jetbrains.jps.builders.BuildOutputConsumer; import org.jetbrains.jps.builders.BuildRootDescriptor; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; -import org.jetbrains.jps.incremental.CompileContext; -import org.jetbrains.jps.incremental.ModuleBuildTarget; -import org.jetbrains.jps.incremental.ProjectBuildException; -import org.jetbrains.jps.incremental.TargetBuilder; +import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; import org.jetbrains.jps.incremental.messages.ProgressMessage; @@ -80,15 +77,15 @@ public class AndroidPackagingBuilder extends TargetBuilder<BuildRootDescriptor, fillStates(modules, resourcesStates, assetsStates, manifestFiles); if (!doCaching(context, modules, resourcesStates)) { - throw new ProjectBuildException(); + throw new StopBuildException(); } if (!doResourcePackaging(context, modules, resourcesStates, assetsStates, manifestFiles)) { - throw new ProjectBuildException(); + throw new StopBuildException(); } if (!doPackaging(context, modules, outputConsumer)) { - throw new ProjectBuildException(); + throw new StopBuildException(); } } catch (ProjectBuildException e) { |