Update the build rules and project template to match the ones in eclair (do not merge)
This will make the new 1.6 SDKs require the tools from Eclair
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml
index 5b32736..675017c 100644
--- a/tools/scripts/android_rules.xml
+++ b/tools/scripts/android_rules.xml
@@ -28,6 +28,11 @@
<!-- Properties -->
+ <!-- Tells adb which device to target. You can change this from the command line
+ by invoking "ant -Dadb.device.arg=-d" for device "ant -Dadb.device.arg=-e" for
+ the emulator. -->
+ <property name="adb.device.arg" value="" />
+
<property name="android.tools.dir" location="${sdk.dir}/tools" />
<!-- Name of the application package extracted from manifest file -->
<xpath input="AndroidManifest.xml" expression="/manifest/@package"
@@ -177,6 +182,7 @@
<sequential>
<echo>Installing ${out.debug.package} onto default emulator or device...</echo>
<exec executable="${adb}" failonerror="true">
+ <arg line="${adb.device.arg}" />
<arg value="install" />
<arg value="-r" />
<arg path="${out.debug.package}" />
@@ -360,6 +366,7 @@
description="Uninstalls the application from a running emulator or device.">
<echo>Uninstalling ${manifest.package} from the default emulator or device...</echo>
<exec executable="${adb}" failonerror="true">
+ <arg line="${adb.device.arg}" />
<arg value="uninstall" />
<arg value="${manifest.package}" />
</exec>
diff --git a/tools/scripts/layout.template b/tools/scripts/layout.template
index 864e997..f5e367c 100644
--- a/tools/scripts/layout.template
+++ b/tools/scripts/layout.template
@@ -7,7 +7,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Hello World, ACTIVITY_NAME"
+ android:text="Hello World, ACTIVITY_ENTRY_NAME"
/>
</LinearLayout>
diff --git a/tools/scripts/strings.template b/tools/scripts/strings.template
index acc28e2..ee5af40 100644
--- a/tools/scripts/strings.template
+++ b/tools/scripts/strings.template
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">ACTIVITY_NAME</string>
+ <string name="app_name">ACTIVITY_ENTRY_NAME</string>
</resources>
