diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-21 14:02:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-09-21 14:02:11 -0700 |
| commit | 225fe918975d7a87daebd5f37afa60a46075699d (patch) | |
| tree | e70d051babd4092a42c73285bed9c68078fc473d /files | |
| parent | 944abd952560b2a40474cabad2d2ad786172164b (diff) | |
| parent | 98b631c6b3765be96b3707ba7aa54d52b10f4872 (diff) | |
| download | sdk-225fe918975d7a87daebd5f37afa60a46075699d.zip sdk-225fe918975d7a87daebd5f37afa60a46075699d.tar.gz sdk-225fe918975d7a87daebd5f37afa60a46075699d.tar.bz2 | |
Merge "Pre-dexed libraries."
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index 4861c1d..9210c66 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -136,6 +136,7 @@ <property name="out.classes.absolute.dir" location="${out.dir}/classes" /> <property name="out.res.absolute.dir" location="${out.dir}/res" /> <property name="out.aidl.absolute.dir" location="${out.dir}/aidl" /> + <property name="out.dexed.absolute.dir" location="${out.dir}/dexedLibs" /> <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xml" /> <!-- tools location --> @@ -274,6 +275,7 @@ <dex executable="${dx}" output="${intermediate.dex.file}" + dexedlibs="${out.dexed.absolute.dir}" nolocals="@{nolocals}" verbose="${verbose}"> <path path="${out.dex.input.absolute.dir}"/> @@ -541,6 +543,7 @@ <do-only-if-manifest-hasCode> <mkdir dir="${gen.absolute.dir}" /> <mkdir dir="${out.classes.absolute.dir}" /> + <mkdir dir="${out.dexed.absolute.dir}" /> </do-only-if-manifest-hasCode> <echo level="info">----------</echo> |