diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-03-26 15:31:54 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-03-26 15:31:54 -0700 |
| commit | 7b38bc7597b2f9b959023aa9266e47bbb3077d55 (patch) | |
| tree | 78c8c8f026e8f663b49f148ee7e8e79a975d1947 /eclipse | |
| parent | 9d6c5d0ae9aa137094f2ce946f60d1a81a2661df (diff) | |
| download | sdk-7b38bc7597b2f9b959023aa9266e47bbb3077d55.zip sdk-7b38bc7597b2f9b959023aa9266e47bbb3077d55.tar.gz sdk-7b38bc7597b2f9b959023aa9266e47bbb3077d55.tar.bz2 | |
ADT: Fix possible NPE in final builder.
Bug: 2546973
Change-Id: I920f67277486c17e6d2790e6921c98864a8c24b0
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java | 2 |
1 files changed, 1 insertions, 1 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 d8aad81..b26b00d 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,7 +276,7 @@ public class ApkBuilder extends BaseBuilder { try { // get the project info ProjectState projectState = Sdk.getProjectState(project); - if (projectState.isLibrary()) { + if (projectState == null || projectState.isLibrary()) { // library project do not need to be dexified or packaged. return null; } |