diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-05-07 11:01:17 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-05-07 11:01:17 -0700 |
| commit | 90827a2dedca04b818a313dde19261f2f20a8683 (patch) | |
| tree | ed02de93b88d73d2113bf96ac113a6e8fb34cfc1 /anttasks | |
| parent | 0a958e76e9406faed2c76d44557c678a6caa7081 (diff) | |
| download | device_generic_opengl-transport-90827a2dedca04b818a313dde19261f2f20a8683.tar.gz device_generic_opengl-transport-90827a2dedca04b818a313dde19261f2f20a8683.tar.bz2 device_generic_opengl-transport-90827a2dedca04b818a313dde19261f2f20a8683.zip | |
Fix NPE when a library does not have a libs folder.
Change-Id: I382fb659073a8d2df8d018acde37d4769ac40cc0
Diffstat (limited to 'anttasks')
| -rw-r--r-- | anttasks/src/com/android/ant/SetupTask.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/anttasks/src/com/android/ant/SetupTask.java b/anttasks/src/com/android/ant/SetupTask.java index 0fbd3a009..184fd2a31 100644 --- a/anttasks/src/com/android/ant/SetupTask.java +++ b/anttasks/src/com/android/ant/SetupTask.java @@ -520,9 +520,11 @@ public final class SetupTask extends ImportTask { // get the jars from it too File libsFolder = new File(rootPath, SdkConstants.FD_NATIVE_LIBS); File[] jarFiles = libsFolder.listFiles(filter); - for (File jarFile : jarFiles) { - element = jarsPath.createPathElement(); - element.setPath(jarFile.getAbsolutePath()); + if (jarFiles != null) { + for (File jarFile : jarFiles) { + element = jarsPath.createPathElement(); + element.setPath(jarFile.getAbsolutePath()); + } } // get the package from the manifest. |