From 9c9eb6099329b2887259bc05e7f21d67d12cc10f Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Tue, 23 Mar 2010 03:19:22 +0000
Subject: [PATCH] Experimentally bump us up to the 2.0.1 SDK to use cketti's
 new code for addresses.

I'd bet 50% that we need to revert this in the end, but I wanted to get
a build out
---
 AndroidManifest.xml | 2 +-
 build.properties    | 2 +-
 build.xml           | 8 ++++----
 default.properties  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8d5b4c3ad..9d9cc1058 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionName="2.513" package="com.fsck.k9">
 	<uses-sdk
 	   android:minSdkVersion="3"
-	   android:targetSdkVersion="5"
+	   android:targetSdkVersion="6"
 	   />
    <supports-screens
 		largeScreens="true"
diff --git a/build.properties b/build.properties
index 42bef63f7..5a74370fd 100644
--- a/build.properties
+++ b/build.properties
@@ -1,2 +1,2 @@
 application-package=com.fsck.k9
-target=android-5
+target=android-6
diff --git a/build.xml b/build.xml
index a51c20a4f..d5ec47884 100644
--- a/build.xml
+++ b/build.xml
@@ -65,7 +65,7 @@
             com.android.ant.AndroidInitTask
 
         The following properties are put in place by the importing task:
-            android-jar, android-aidl, aapt, aidl, and dx
+            android.jar, android-aidl, aapt, aidl, and dx
 
         Additionnaly, the task sets up the following classpath reference:
             android.target.classpath
@@ -171,7 +171,7 @@
             <arg value="-S" />
             <arg path="${resource-folder}" />
             <arg value="-I" />
-            <arg path="${android-jar}" />
+            <arg path="${android.jar}" />
         </exec>
     </target>
 
@@ -198,7 +198,7 @@
             <classpath>
                 <fileset dir="${external-libs-folder}" includes="*.jar"/>
                 <fileset dir="${compile-only-libs-folder}" includes="*.jar"/>
-                <fileset dir="${sdk-location}/platforms/android-1.6/" includes="**/*.jar"/>
+                <fileset dir="${sdk-location}/platforms/android-2.0.1/" includes="**/*.jar"/>
                 <pathelement path="${main-out-classes}"/>
             </classpath>
          </javac>
@@ -237,7 +237,7 @@
                 manifest="AndroidManifest.xml"
                 resources="${resource-folder}"
                 assets="${asset-folder}"
-                androidjar="${android-jar}"
+                androidjar="${android.jar}"
                 outfolder="${out-folder}"
                 basename="${ant.project.name}" />
     </target>
diff --git a/default.properties b/default.properties
index 19c96655d..6017a4b04 100644
--- a/default.properties
+++ b/default.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-4
+target=android-6