aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-03-17 15:32:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-17 15:32:44 -0700
commitf34bf2da4b910dd8b3cc7e09e4e8d6d2fe6f9525 (patch)
tree3e7106c975fbe4a0b303be7951f028d7e0a233fd /eclipse
parent863cb45615a0e5eced094ab2500362bf2c0ef7f2 (diff)
parent0380e9fdaa7044cbc89b25a8f736790c57ec4068 (diff)
downloadsdk-f34bf2da4b910dd8b3cc7e09e4e8d6d2fe6f9525.zip
sdk-f34bf2da4b910dd8b3cc7e09e4e8d6d2fe6f9525.tar.gz
sdk-f34bf2da4b910dd8b3cc7e09e4e8d6d2fe6f9525.tar.bz2
Merge "ADT: Do not run apkbuilder on libraries."
Diffstat (limited to 'eclipse')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java
index 2b35806..d8aad81 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java
@@ -276,6 +276,10 @@ public class ApkBuilder extends BaseBuilder {
try {
// get the project info
ProjectState projectState = Sdk.getProjectState(project);
+ if (projectState.isLibrary()) {
+ // library project do not need to be dexified or packaged.
+ return null;
+ }
// get the libraries
libProjects = projectState.getLibraryProjects();