From 8eff7f5779ba938ba7dcd981e0c6f3f97096dd26 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Thu, 8 Oct 2009 15:02:10 -0700
Subject: [PATCH] Support adb device-targeting arguments in ant scripts.

Example of usage:
  $ ant install -Dadb.device.arg=-d

SDK BUG 2172690

Change-Id: I196441f9aab888b1356b4fc0255842570be5140f
---
 tools/scripts/android_rules.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml
index 5b327369a..a23571661 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 value="${adb.device.arg}" />
                 <arg value="install" />
                 <arg value="-r" />
                 <arg path="${out.debug.package}" />