Fix ant install when -Dadb.device.arg not provided.
And also add the adb.device.arg support to ant uninstall.
BUG 2172690
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml
index a235716..675017c 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>