From b995547c3a57d7c1702fb4ef607fc4794b393e48 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Fri, 18 Dec 2009 20:04:17 +0000
Subject: More build.xml cleanups

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@447 df292f66-193f-0410-a5fc-6d59da041ff2
---
 tests/AndroidManifest.xml |  4 +++-
 tests/build.xml           | 20 +++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 54a2a02..7dc06ee 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -17,5 +17,7 @@
     -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
                      android:targetPackage="org.connectbot"
-                     android:label="Tests for HostListActivity"/>
+                     android:label="Tests for HostListActivity" />
+
+    <uses-sdk android:targetSdkVersion="6" android:minSdkVersion="3" />
 </manifest>
diff --git a/tests/build.xml b/tests/build.xml
index cbce2d7..ca78485 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -14,9 +14,9 @@
          application-package
              the name of your application package as defined in the manifest. Used by the
              'uninstall' rule.
-         source-folder
+         source.dir
              the name of the source folder. Default is 'src'.
-         out-folder
+         out.dir
              the name of the output folder. Default is 'bin'.
 
          Properties related to the SDK location or the project target should be updated
@@ -37,11 +37,11 @@
     <!-- Custom Android task to deal with the project target, and import the proper rules.
          This requires ant 1.6.0 or above. -->
     <path id="android.antlibs">
-        <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
     </path>
 
     <taskdef name="setup"
@@ -58,10 +58,4 @@
          targets are used.
     -->
     <setup />
-
-    <target name="clean"
-        description="Clean up the result of the build process">
-        <delete dir="${out-folder}"/>
-        <delete dir="${gen-folder}"/>
-    </target>
 </project>
-- 
cgit v1.2.3