diff options
| author | Brett Chabot <brettchabot@android.com> | 2009-10-08 21:19:36 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@android.com> | 2009-10-09 11:42:14 -0700 |
| commit | 1a363965c5f7b80affc2c74bd614a448f4ee05dc (patch) | |
| tree | 387e72320fc02fda2fb235e7ccdbfb8c9b88ef06 /tools/scripts/android_rules.xml | |
| parent | 3334a5874e81a936cb866fd19f4beb7a425989ef (diff) | |
| download | android_development-1a363965c5f7b80affc2c74bd614a448f4ee05dc.tar.gz android_development-1a363965c5f7b80affc2c74bd614a448f4ee05dc.tar.bz2 android_development-1a363965c5f7b80affc2c74bd614a448f4ee05dc.zip | |
Fix ant install when -Dadb.device.arg not provided.
And also add the adb.device.arg support to ant uninstall.
BUG 2172690
Diffstat (limited to 'tools/scripts/android_rules.xml')
| -rw-r--r-- | tools/scripts/android_rules.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml index a23571661..675017c0b 100644 --- a/tools/scripts/android_rules.xml +++ b/tools/scripts/android_rules.xml @@ -182,7 +182,7 @@ <sequential> <echo>Installing ${out.debug.package} onto default emulator or device...</echo> <exec executable="${adb}" failonerror="true"> - <arg value="${adb.device.arg}" /> + <arg line="${adb.device.arg}" /> <arg value="install" /> <arg value="-r" /> <arg path="${out.debug.package}" /> @@ -366,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> |