diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-06-28 14:47:13 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-06-29 12:08:01 -0700 |
| commit | 345353594f7eebc5a04a20bef2b6dd581e09c364 (patch) | |
| tree | 17256f7d3d4bebde74a7c79ed43a5c41dfe5c624 /files/ant | |
| parent | 5aea83e90d706a4f14082be562d9d310f171e8c2 (diff) | |
| download | sdk-345353594f7eebc5a04a20bef2b6dd581e09c364.zip sdk-345353594f7eebc5a04a20bef2b6dd581e09c364.tar.gz sdk-345353594f7eebc5a04a20bef2b6dd581e09c364.tar.bz2 | |
Ant support for library depending on other libraries.
Change-Id: Ief8261327f7917d158fc8ad4dd4e4c3d322bbce2
Diffstat (limited to 'files/ant')
| -rw-r--r-- | files/ant/ant_lib_rules_r3.xml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/files/ant/ant_lib_rules_r3.xml b/files/ant/ant_lib_rules_r3.xml index f4816fc..a1b2217 100644 --- a/files/ant/ant_lib_rules_r3.xml +++ b/files/ant/ant_lib_rules_r3.xml @@ -57,7 +57,6 @@ <!-- Directory for the third party java libraries --> <property name="external.libs.dir" value="libs" /> <property name="external.libs.absolute.dir" location="${external.libs.dir}" /> - <!-- Directory for the native libraries --> <property name="native.libs.dir" value="libs" /> <property name="native.libs.absolute.dir" location="${native.libs.dir}" /> @@ -148,14 +147,23 @@ value="${tested.project.absolute.dir}/bin/classes" else="."> <isset property="tested.project.absolute.dir" /> </condition> + <condition property="extensible.libs.classpath" + value="${tested.project.absolute.dir}/libs" + else="./libs"> + <isset property="tested.project.absolute.dir" /> + </condition> <javac encoding="ascii" target="1.5" debug="true" extdirs="" destdir="${out.classes.absolute.dir}" bootclasspathref="android.target.classpath" - verbose="${verbose}" classpath="${extensible.classpath}"> + verbose="${verbose}" + classpath="${extensible.classpath}" + classpathref="android.libraries.jars"> <src path="${source.absolute.dir}" /> <src path="${gen.absolute.dir}" /> + <src refid="android.libraries.src" /> <classpath> <fileset dir="${external.libs.absolute.dir}" includes="*.jar" /> + <fileset dir="${extensible.libs.classpath}" includes="*.jar" /> </classpath> </javac> </target> |