From 68c1563b708276d396773e47effc28fb2d5e1a16 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Wed, 27 Oct 2010 15:31:57 -0700
Subject: Fix adb location in ant rules.

Change-Id: Ia8188de0b8af0ec4474f5c4ca2cec294c077e03f
---
 files/ant/lib_rules.xml  | 5 -----
 files/ant/main_rules.xml | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'files/ant')

diff --git a/files/ant/lib_rules.xml b/files/ant/lib_rules.xml
index a1b2217..96dc407 100644
--- a/files/ant/lib_rules.xml
+++ b/files/ant/lib_rules.xml
@@ -32,11 +32,6 @@
 
     <!-- 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"
diff --git a/files/ant/main_rules.xml b/files/ant/main_rules.xml
index f573f48..7be13d7 100644
--- a/files/ant/main_rules.xml
+++ b/files/ant/main_rules.xml
@@ -42,6 +42,7 @@
     <property name="adb.device.arg" value="" />
 
     <property name="android.tools.dir" location="${sdk.dir}/tools" />
+    <property name="android.platform.tools.dir" location="${sdk.dir}/platform-tools" />
     <!-- Name of the application package extracted from manifest file -->
     <xpath input="AndroidManifest.xml" expression="/manifest/@package"
                 output="manifest.package" />
@@ -157,7 +158,7 @@
 
     <!-- Tools -->
     <condition property="exe" value=".exe" else=""><os family="windows" /></condition>
-    <property name="adb" location="${android.tools.dir}/adb${exe}" />
+    <property name="adb" location="${android.platform.tools.dir}/adb${exe}" />
     <property name="zipalign" location="${android.tools.dir}/zipalign${exe}" />
 
     <!-- Emma configuration -->
-- 
cgit v1.1