diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-09-29 11:31:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-29 11:31:15 -0700 |
| commit | 8a2506dfc699e77a736361c91a0d642bccd82b77 (patch) | |
| tree | 19a05f86a5fba297486bdd447c92700729056cd1 /eclipse | |
| parent | 969387ab34fd270081a23f6c4234bcf09b88f5e8 (diff) | |
| parent | 440fea93f44e60893e0ed43e031a8ababe2215b7 (diff) | |
| download | sdk-8a2506dfc699e77a736361c91a0d642bccd82b77.zip sdk-8a2506dfc699e77a736361c91a0d642bccd82b77.tar.gz sdk-8a2506dfc699e77a736361c91a0d642bccd82b77.tar.bz2 | |
Merge "Don't add Android referenced project to library output."
Diffstat (limited to 'eclipse')
2 files changed, 6 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java index e3ec83c..63746ed 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java @@ -53,8 +53,6 @@ public class AdtConstants { /** Nature of default Android projects */ public final static String NATURE_DEFAULT = "com.android.ide.eclipse.adt.AndroidNature"; //$NON-NLS-1$ - /** Nature of Android export projects */ - public final static String NATURE_EXPORT = "com.android.ide.eclipse.adt.AndroidExportNature"; //$NON-NLS-1$ /** The container id for the android framework jar file */ public final static String CONTAINER_FRAMEWORK = diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java index 7f75c4f..6c2af35 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java @@ -869,6 +869,12 @@ public class PostCompilerBuilder extends BaseBuilder { // do the same for all the referencedJava project for (IJavaProject javaProject : referencedJavaProjects) { + // in case an Android project was referenced (which won't work), the + // best thing is to ignore this project. + if (javaProject.getProject().hasNature(AdtConstants.NATURE_DEFAULT)) { + continue; + } + IFolder refProjectOutput = BaseProjectHelper.getJavaOutputFolder( javaProject.getProject()); |