OSDN Git Service
(root)
/
android-x86
/
sdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix NPE in projects with no code. Do not merge.
[android-x86/sdk.git]
/
anttasks
/
src
/
com
/
android
/
ant
/
ApkBuilderTask.java
diff --git
a/anttasks/src/com/android/ant/ApkBuilderTask.java
b/anttasks/src/com/android/ant/ApkBuilderTask.java
index
88bd59c
..
57347a4
100644
(file)
--- a/
anttasks/src/com/android/ant/ApkBuilderTask.java
+++ b/
anttasks/src/com/android/ant/ApkBuilderTask.java
@@
-233,7
+233,9
@@
public class ApkBuilderTask extends BaseTask {
inputPaths.add(resourceInputPath);
// dex file
- inputPaths.add(new InputPath(dexFile));
+ if (dexFile != null) {
+ inputPaths.add(new InputPath(dexFile));
+ }
// zip input files
List<File> zipFiles = new ArrayList<File>();