diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant_rules_r1.xml | 5 | ||||
| -rw-r--r-- | files/ant_rules_r2.xml | 5 | ||||
| -rw-r--r-- | files/ant_test_rules_r2.xml | 2 | ||||
| -rw-r--r-- | files/tools_source.properties | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/files/ant_rules_r1.xml b/files/ant_rules_r1.xml index 675017c..9ff30f3 100644 --- a/files/ant_rules_r1.xml +++ b/files/ant_rules_r1.xml @@ -242,6 +242,10 @@ 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" @@ -250,6 +254,7 @@ <src path="${gen.absolute.dir}" /> <classpath> <fileset dir="${external.libs.absolute.dir}" includes="*.jar" /> + <fileset dir="${extensible.libs.classpath}" includes="*.jar" /> </classpath> </javac> </target> diff --git a/files/ant_rules_r2.xml b/files/ant_rules_r2.xml index 6e48796..ffd7c41 100644 --- a/files/ant_rules_r2.xml +++ b/files/ant_rules_r2.xml @@ -244,6 +244,10 @@ 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" @@ -254,6 +258,7 @@ <src refid="android.libraries.src" /> <classpath> <fileset dir="${external.libs.absolute.dir}" includes="*.jar" /> + <fileset dir="${extensible.libs.classpath}" includes="*.jar" /> </classpath> </javac> </target> diff --git a/files/ant_test_rules_r2.xml b/files/ant_test_rules_r2.xml index 78503ae..00ebfea 100644 --- a/files/ant_test_rules_r2.xml +++ b/files/ant_test_rules_r2.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="android_test_rules" default="run-tests"> - <import file="android_rules.xml" /> + <import file="ant_rules_r2.xml" /> <property name="tested.project.absolute.dir" location="${tested.project.dir}" /> <property name="instrumentation.dir" value="instrumented" /> diff --git a/files/tools_source.properties b/files/tools_source.properties index 47cffcf..dc91174 100644 --- a/files/tools_source.properties +++ b/files/tools_source.properties @@ -1,2 +1,2 @@ Pkg.UserSrc=false -Pkg.Revision=6 +Pkg.Revision=7 |