diff options
author | Xavier Ducrohet <xav@android.com> | 2012-03-06 15:32:10 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-06 15:32:10 -0800 |
commit | 8fca561846794680e582b2c1416ebda030a90f1a (patch) | |
tree | 65c6ea8ab2ef3096f67da996ff932c0aaf87bf3c /eclipse | |
parent | f29def16b4d4f906f059b5ee88c7bb38523bc3e8 (diff) | |
parent | a794cb4669b5b77ad1956598213f0ce5b1fb6d8b (diff) | |
download | sdk-8fca561846794680e582b2c1416ebda030a90f1a.zip sdk-8fca561846794680e582b2c1416ebda030a90f1a.tar.gz sdk-8fca561846794680e582b2c1416ebda030a90f1a.tar.bz2 |
Merge "Only add Java project's jar file if they are exported."
Diffstat (limited to 'eclipse')
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java index 197d18c..65fd9c7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java @@ -350,6 +350,10 @@ public class LibraryClasspathContainerInitializer extends BaseClasspathContainer IClasspathEntry[] classpaths = javaProject.readRawClasspath(); if (classpaths != null) { for (IClasspathEntry e : classpaths) { + // only consider the classpath entries that are exported. + if (e.isExported() == false) { + continue; + } // if this is a classpath variable reference, we resolve it. if (e.getEntryKind() == IClasspathEntry.CPE_VARIABLE) { e = JavaCore.getResolvedClasspathEntry(e); @@ -368,7 +372,9 @@ public class LibraryClasspathContainerInitializer extends BaseClasspathContainer container.getKind() == IClasspathContainer.K_APPLICATION) { IClasspathEntry[] entries = container.getClasspathEntries(); for (IClasspathEntry entry : entries) { - handleClasspathEntry(entry, wsRoot, jarFiles); + if (entry.isExported()) { + handleClasspathEntry(entry, wsRoot, jarFiles); + } } } } catch (JavaModelException jme) { |