LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/anttasks/src/com/android/ant/AaptExecLoopTask.java
View File

@@ -181,11 +181,14 @@ public final class AaptExecLoopTask extends Task {
task.createArg().setValue("-M"); task.createArg().setValue("-M");
task.createArg().setValue(mManifest); task.createArg().setValue(mManifest);
// resources location // 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("-S");
task.createArg().setValue(mResources); 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); File assets = new File(mAssets);
if (assets.isDirectory()) { if (assets.isDirectory()) {
task.createArg().setValue("-A"); task.createArg().setValue("-A");

1
tools/scripts/android_rules.xml
View File

@@ -72,6 +72,7 @@
<!-- Create the output directories if they don't exist yet. --> <!-- Create the output directories if they don't exist yet. -->
<target name="dirs"> <target name="dirs">
<echo>Creating output directories if needed...</echo> <echo>Creating output directories if needed...</echo>
<mkdir dir="${resource-folder}" />
<mkdir dir="${external-libs-folder}" /> <mkdir dir="${external-libs-folder}" />
<mkdir dir="${gen-folder}" /> <mkdir dir="${gen-folder}" />
<mkdir dir="${out-folder}" /> <mkdir dir="${out-folder}" />