From 1a363965c5f7b80affc2c74bd614a448f4ee05dc Mon Sep 17 00:00:00 2001
From: Brett Chabot <brettchabot@android.com>
Date: Thu, 8 Oct 2009 21:19:36 -0700
Subject: [PATCH] Fix ant install when -Dadb.device.arg not provided.

And also add the adb.device.arg support to ant uninstall.

BUG 2172690
---
 tools/scripts/android_rules.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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>