diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-13 13:04:19 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-13 13:04:19 -0700 |
| commit | 59008ebc2c43def1ca918d8f6bcdb5e14df394ef (patch) | |
| tree | c485998f2f31b1126b405c5d3c88d8e2052d3768 /tools/scripts | |
| parent | 243d18eb22363fcfe5fd76d93c8d2e30f1246ffd (diff) | |
| download | android_development-59008ebc2c43def1ca918d8f6bcdb5e14df394ef.tar.gz android_development-59008ebc2c43def1ca918d8f6bcdb5e14df394ef.tar.bz2 android_development-59008ebc2c43def1ca918d8f6bcdb5e14df394ef.zip | |
auto import from //branches/cupcake_rel/...@138607
Diffstat (limited to 'tools/scripts')
| -rw-r--r-- | tools/scripts/android_rules.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml index 799aa0b8a..aad9dbd6e 100644 --- a/tools/scripts/android_rules.xml +++ b/tools/scripts/android_rules.xml @@ -28,6 +28,7 @@ <!-- Input directories --> <property name="source-folder" value="src" /> + <property name="gen-folder" value="gen" /> <property name="resource-folder" value="res" /> <property name="asset-folder" value="assets" /> <property name="source-location" value="${basedir}/${source-folder}" /> @@ -39,6 +40,7 @@ <property name="native-libs-folder" value="libs" /> <!-- Output directories --> + <property name="gen-folder" value="gen" /> <property name="out-folder" value="bin" /> <property name="out-classes" value="${out-folder}/classes" /> <property name="out-classes-location" value="${basedir}/${out-classes}"/> @@ -46,9 +48,6 @@ <property name="main-out-folder" value="../${out-folder}" /> <property name="main-out-classes" value="${main-out-folder}/classes"/> - <!-- Create R.java in the source directory --> - <property name="r-folder" value="${source-folder}" /> - <!-- Intermediate files --> <property name="dex-file" value="classes.dex" /> <property name="intermediate-dex" value="${out-folder}/${dex-file}" /> @@ -73,6 +72,8 @@ <!-- Create the output directories if they don't exist yet. --> <target name="dirs"> <echo>Creating output directories if needed...</echo> + <mkdir dir="${external-libs-folder}" /> + <mkdir dir="${gen-folder}" /> <mkdir dir="${out-folder}" /> <mkdir dir="${out-classes}" /> </target> @@ -84,7 +85,7 @@ <arg value="package" /> <arg value="-m" /> <arg value="-J" /> - <arg path="${r-folder}" /> + <arg path="${gen-folder}" /> <arg value="-M" /> <arg path="AndroidManifest.xml" /> <arg value="-S" /> @@ -100,6 +101,7 @@ <apply executable="${aidl}" failonerror="true"> <arg value="-p${android-aidl}" /> <arg value="-I${source-folder}" /> + <arg value="-o${gen-folder}" /> <fileset dir="${source-folder}"> <include name="**/*.aidl"/> </fileset> @@ -107,11 +109,12 @@ </target> <!-- Compile this project's .java files into .class files. --> - <target name="compile" depends="dirs, resource-src, aidl"> + <target name="compile" depends="resource-src, aidl"> <javac encoding="ascii" target="1.5" debug="true" extdirs="" - srcdir="${source-folder}" destdir="${out-classes}" bootclasspathref="android.target.classpath"> + <src path="${source-folder}" /> + <src path="${gen-folder}" /> <classpath> <fileset dir="${external-libs-folder}" includes="*.jar"/> <pathelement path="${main-out-classes}"/> |