diff options
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | tests/build.xml | 20 |
4 files changed, 14 insertions, 18 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 18db390..ff79584 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" android:versionName="1.6-dev" - android:versionCode="224"> + android:versionCode="225"> <application android:icon="@drawable/icon" @@ -48,7 +48,7 @@ </application> - <uses-sdk android:targetSdkVersion="6" android:minSdkVersion="3"/> + <uses-sdk android:targetSdkVersion="6" android:minSdkVersion="3" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.VIBRATE" /> @@ -56,5 +56,5 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <supports-screens/> + <supports-screens /> </manifest> @@ -334,7 +334,7 @@ <apply executable="${dx}" failonerror="true" parallel="true"> <arg value="--dex" /> <arg value="--output=${intermediate.dex.file}" /> - <fileset dir="${out.classes.absolute.dir}" includes="*.min.jar" /> + <fileset dir="${out.absolute.dir}" includes="*.min.jar" /> <fileset dir="${external.libs.absolute.dir}" includes="*.jar"/> </apply> </target> 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> |