From: Xavier Ducrohet <>
Date: Wed, 25 Mar 2009 03:33:11 +0000 (-0700)
Subject: Automated import from //branches/master/...@141558,141558
X-Git-Tag: android-x86-2.2~1197
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dcd08758589d6d20e2cdddb3b450c6a577b03a37;p=android-x86%2Fsdk.git

Automated import from //branches/master/...@141558,141558
---

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java
index bc5b01c5f..1edcf79fd 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/ApkBuilder.java
@@ -979,7 +979,10 @@ public class ApkBuilder extends BaseBuilder {
         writeStandardProjectResources(jarBuilder, javaProject, wsRoot, list);
         
         for (IJavaProject referencedJavaProject : referencedJavaProjects) {
-            if (referencedJavaProject.getProject().hasNature(AndroidConstants.NATURE)) {
+            // only include output from non android referenced project
+            // (This is to handle the case of reference Android projects in the context of 
+            // instrumentation projects that need to reference the projects to be tested).
+            if (referencedJavaProject.getProject().hasNature(AndroidConstants.NATURE) == false) {
                 writeStandardProjectResources(jarBuilder, referencedJavaProject, wsRoot, list);
             }
         }
@@ -1084,7 +1087,10 @@ public class ApkBuilder extends BaseBuilder {
         IWorkspaceRoot wsRoot = ws.getRoot();
 
         for (IJavaProject javaProject : referencedJavaProjects) {
-            if (javaProject.getProject().hasNature(AndroidConstants.NATURE)) {
+            // only include output from non android referenced project
+            // (This is to handle the case of reference Android projects in the context of 
+            // instrumentation projects that need to reference the projects to be tested).
+            if (javaProject.getProject().hasNature(AndroidConstants.NATURE) == false) {
                 // get the output folder
                 IPath path = null;
                 try {