diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-09 18:51:39 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-09 18:51:39 -0400 |
| commit | fd2c838fb4de9b91afcc9888f5b58487070cec19 (patch) | |
| tree | 7918291d8a0cc94a3918b812c63864fb9da0153e | |
| parent | fb244224235c33b492774f32e8caf8d43f2a3cec (diff) | |
| parent | 4dcec84dcebfd7b15b5dc8652ec6f6a8947feacd (diff) | |
| download | android_development-fd2c838fb4de9b91afcc9888f5b58487070cec19.tar.gz android_development-fd2c838fb4de9b91afcc9888f5b58487070cec19.tar.bz2 android_development-fd2c838fb4de9b91afcc9888f5b58487070cec19.zip | |
Merge change I4dcec84d into donut
* changes:
Update the build rules and project template to match the ones in eclair (do not merge)
| -rw-r--r-- | tools/scripts/android_rules.xml | 7 | ||||
| -rw-r--r-- | tools/scripts/layout.template | 2 | ||||
| -rw-r--r-- | tools/scripts/strings.template | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml index 5b327369a..675017c0b 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 864e99748..f5e367ccf 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 acc28e29d..ee5af40eb 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> |