Automated import from //branches/master/...@141596,141596

This commit is contained in:
Xavier Ducrohet
2009-03-24 20:36:56 -07:00
committed by The Android Open Source Project
parent 0b0b08bbf7
commit eacc76c364
2 changed files with 8 additions and 4 deletions

View File

@@ -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");