From c86903288cfda792de9f92e7615af32db8cff452 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Fri, 21 Aug 2009 15:56:47 -0700
Subject: [PATCH] Fix target for ApiDemos (API is now 4)

Also add some progress output to the ant rules.
---
 samples/ApiDemos/default.properties | 2 +-
 tools/scripts/android_rules.xml     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/ApiDemos/default.properties b/samples/ApiDemos/default.properties
index 4513a1e4f..9d79b12c7 100644
--- a/samples/ApiDemos/default.properties
+++ b/samples/ApiDemos/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-3
+target=android-4
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml
index c8880c8d7..de44a7e6e 100644
--- a/tools/scripts/android_rules.xml
+++ b/tools/scripts/android_rules.xml
@@ -180,6 +180,7 @@
     </target>
 
     <target name="debug" depends="dex, package-resources, debug-sign, package">
+        <echo>Running zip align on final apk...</echo>
         <exec executable="${zipalign}" failonerror="true">
             <arg value="-f" />
             <arg value="4" />
@@ -215,6 +216,7 @@
                 message="Please enter password for alias '${key.alias}':"
                 addproperty="key.alias.password"/>
         <!-- sign the APK -->
+        <echo>Signing final apk...</echo>
         <signjar
                 jar="${out-unsigned-package}"
                 signedjar="${out-unaligned-package}"
@@ -223,6 +225,7 @@
                 alias="${key.alias}"
                 keypass="${key.alias.password}"/>
         <!-- zip align the APK -->
+        <echo>Running zip align on final apk...</echo>
         <exec executable="${zipalign}" failonerror="true">
             <arg value="-f" />
             <arg value="4" />