diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-04-02 15:57:50 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-04-02 16:05:04 -0700 |
| commit | 5f3bb57d677abc71a3ef6fc2d8e880ede3f61ce9 (patch) | |
| tree | fa2ee3202df2c3578d2b1efba36e66376bda19cf | |
| parent | b8ee75d9325932837e836b9136099770a095a556 (diff) | |
| download | sdk-5f3bb57d677abc71a3ef6fc2d8e880ede3f61ce9.zip sdk-5f3bb57d677abc71a3ef6fc2d8e880ede3f61ce9.tar.gz sdk-5f3bb57d677abc71a3ef6fc2d8e880ede3f61ce9.tar.bz2 | |
Fix Ant test rules.
- Fix import of the main rules since we changed the name!
- Added main project libraries to the classpath of the test project.
Bug: 2568115
Change-Id: I8803b84a179c6301736d7e2558e06a1734eef650
| -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 |
3 files changed, 11 insertions, 1 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" /> |