diff options
| author | Xavier Ducrohet <> | 2009-03-24 20:36:19 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 20:36:19 -0700 |
| commit | aa3b63abf4f949b6ef98ef72c1305d5b2603e3fd (patch) | |
| tree | eb4e35a22e386659d6a6bd167709c6409d64c746 /tools/anttasks | |
| parent | 7b82e66c0dd17948918782b3d2f353846e6436c5 (diff) | |
| download | android_development-aa3b63abf4f949b6ef98ef72c1305d5b2603e3fd.tar.gz android_development-aa3b63abf4f949b6ef98ef72c1305d5b2603e3fd.tar.bz2 android_development-aa3b63abf4f949b6ef98ef72c1305d5b2603e3fd.zip | |
Automated import from //branches/donutburger/...@141594,141594
Diffstat (limited to 'tools/anttasks')
| -rw-r--r-- | tools/anttasks/src/com/android/ant/AaptExecLoopTask.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/anttasks/src/com/android/ant/AaptExecLoopTask.java b/tools/anttasks/src/com/android/ant/AaptExecLoopTask.java index d2c71624d..6444e4d01 100644 --- a/tools/anttasks/src/com/android/ant/AaptExecLoopTask.java +++ b/tools/anttasks/src/com/android/ant/AaptExecLoopTask.java @@ -181,11 +181,14 @@ public final class AaptExecLoopTask extends Task { task.createArg().setValue("-M"); task.createArg().setValue(mManifest); - // resources location - task.createArg().setValue("-S"); - task.createArg().setValue(mResources); + // resources location. This may not exists, and aapt doesn't like it, so we check first. + File res = new File(mResources); + if (res.isDirectory()) { + task.createArg().setValue("-S"); + task.createArg().setValue(mResources); + } - // assets location. this may not exists, and aapt doesn't like it, so we check first. + // assets location. This may not exists, and aapt doesn't like it, so we check first. File assets = new File(mAssets); if (assets.isDirectory()) { task.createArg().setValue("-A"); |