منصة شليله
Fork

Commit

Revision	aa3b63abf4f949b6ef98ef72c1305d5b2603e3fd (tree)
Time	2009-03-25 12:36:19
Author	Xavier Ducrohet <>
Commiter	The Android Open Source Project

Automated import from //branches/donutburger/...@141594,141594

--- 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 {
181	181	task.createArg().setValue("-M");
182	182	task.createArg().setValue(mManifest);
183	183
184		- // resources location
185		- task.createArg().setValue("-S");
186		- task.createArg().setValue(mResources);
	184	+ // resources location. This may not exists, and aapt doesn't like it, so we check first.
	185	+ File res = new File(mResources);
	186	+ if (res.isDirectory()) {
	187	+ task.createArg().setValue("-S");
	188	+ task.createArg().setValue(mResources);
	189	+ }
187	190
188		- // assets location. this may not exists, and aapt doesn't like it, so we check first.
	191	+ // assets location. This may not exists, and aapt doesn't like it, so we check first.
189	192	File assets = new File(mAssets);
190	193	if (assets.isDirectory()) {
191	194	task.createArg().setValue("-A");

--- a/tools/scripts/android_rules.xml

+++ b/tools/scripts/android_rules.xml

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