From a54d1c2098e0bb90b734e5e67690a0a76ab9979c Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Tue, 22 Sep 2009 13:48:21 +0000
Subject: [PATCH] Fixes to build.xml to actually be able to sign a jar in the
 1.5 world order.

---
 build.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 64ea05f5c..e6d668577 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,9 @@
         <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
         <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
         <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
-    </path>
+	</path>
+
+	<property environment="env"/>
 
     <taskdef name="setup"
         classname="com.android.ant.SetupTask"
@@ -122,6 +124,9 @@
 
     <!-- The final package file to generate -->
     <property name="out-debug-package" value="${out-folder}/${ant.project.name}-debug.apk"/>
+    <property name="out-unsigned-package" value="${out-folder}/${ant.project.name}-unsigned.apk"/>
+    <property name="out-signed-package" value="${out-folder}/${ant.project.name}-signed.apk"/>
+
 
     <!-- Tools -->
     <condition property="exe" value=".exe" else=""><os family="windows"/></condition>
@@ -252,10 +257,10 @@
         <exec executable="jarsigner" failonerror="true">
             <arg value="-verbose" />
             <arg value="-storepass" />
-            <arg value="${env.jarpass}" />
+			<arg value="${env.jarpass}" />
             <arg value="-signedjar" />
-            <arg value="${out-signed-package-ospath}" />
-            <arg value="${out-unsigned-package-ospath}" />
+            <arg value="${out-signed-package}" />
+            <arg value="${out-unsigned-package}" />
 
             <arg value="fsckcom" />
         </exec>