From cc2fef854ce867e11cf41b0b3fdab1a699a1ac78 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Mon, 1 Oct 2012 15:52:10 +0400
Subject: [PATCH] target dependency android_packaging->android_dex; equals and
 hashCode for AndroidProjectBuildTarget class

---
 .../builder/AndroidProjectBuildTarget.java       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/builder/AndroidProjectBuildTarget.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/builder/AndroidProjectBuildTarget.java
index 38701760d902..89b7525ed1d4 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/builder/AndroidProjectBuildTarget.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/builder/AndroidProjectBuildTarget.java
@@ -55,6 +55,9 @@ public class AndroidProjectBuildTarget extends BuildTarget<BuildRootDescriptor>
   @Override
   public Collection<BuildTarget<?>> computeDependencies() {
     List<BuildTarget<?>> result = new ArrayList<BuildTarget<?>>();
+    if (myKind == AndroidBuilderKind.PACKAGING) {
+      result.add(new AndroidProjectBuildTarget(AndroidBuilderKind.DEX, myModel));
+    }
     for (JpsModule module : myModel.getProject().getModules()) {
       if (AndroidJpsUtil.getExtension(module) != null) {
         result.add(new ModuleBuildTarget(module, JavaModuleBuildTargetType.PRODUCTION));
@@ -63,6 +66,19 @@ public class AndroidProjectBuildTarget extends BuildTarget<BuildRootDescriptor>
     return result;
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    return myKind == ((AndroidProjectBuildTarget)o).myKind;
+  }
+
+  @Override
+  public int hashCode() {
+    return myKind.hashCode();
+  }
+
   @NotNull
   @Override
   public List<BuildRootDescriptor> computeRootDescriptors(JpsModel model, ModuleExcludeIndex index, IgnoredFileIndex ignoredFileIndex) {