diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-10-27 16:57:13 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-10-27 16:57:13 -0700 |
| commit | ab1bbd459feb0c3832d2b51bd24d76ed47378cf8 (patch) | |
| tree | 3e45f07b2d902ddff3c32b9948ed3b3a556c7909 /files | |
| parent | 2e7e964762a684030ab1f1b143da00098e60e47c (diff) | |
| parent | 7b8e64de9afc64602d2c7dee1a721fd7c04f546d (diff) | |
| download | sdk-ab1bbd459feb0c3832d2b51bd24d76ed47378cf8.zip sdk-ab1bbd459feb0c3832d2b51bd24d76ed47378cf8.tar.gz sdk-ab1bbd459feb0c3832d2b51bd24d76ed47378cf8.tar.bz2 | |
merge from open-source master
Change-Id: I8115fa4f83035d6a5aa59bcb0a5603f38f99a59b
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/lib_rules.xml | 5 | ||||
| -rw-r--r-- | files/ant/main_rules.xml | 3 |
2 files changed, 2 insertions, 6 deletions
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 --> |