Fix adb location in ant rules.

Change-Id: Ia8188de0b8af0ec4474f5c4ca2cec294c077e03f

diff --git a/files/ant/lib_rules.xml b/files/ant/lib_rules.xml
index a1b2217..96dc407 100644 (file)
--- 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 (file)
--- 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 -->