LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change Idf5bcb58 into eclair

Browse Source 
* changes:
  Fix ant install when -Dadb.device.arg not provided.
This commit is contained in:
Android (Google) Code Review
2009-10-09 14:45:22 -04:00
parent b2fa9b713d 1a363965c5
commit 264d42dd1c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/scripts/android_rules.xml
View File

@@ -182,7 +182,7 @@
<sequential> <sequential>
<echo>Installing ${out.debug.package} onto default emulator or device...</echo> <echo>Installing ${out.debug.package} onto default emulator or device...</echo>
<exec executable="${adb}" failonerror="true"> <exec executable="${adb}" failonerror="true">
<arg value="${adb.device.arg}" /> <arg line="${adb.device.arg}" />
<arg value="install" /> <arg value="install" />
<arg value="-r" /> <arg value="-r" />
<arg path="${out.debug.package}" /> <arg path="${out.debug.package}" />
@@ -366,6 +366,7 @@
description="Uninstalls the application from a running emulator or device."> description="Uninstalls the application from a running emulator or device.">
<echo>Uninstalling ${manifest.package} from the default emulator or device...</echo> <echo>Uninstalling ${manifest.package} from the default emulator or device...</echo>
<exec executable="${adb}" failonerror="true"> <exec executable="${adb}" failonerror="true">
<arg line="${adb.device.arg}" />
<arg value="uninstall" /> <arg value="uninstall" />
<arg value="${manifest.package}" /> <arg value="${manifest.package}" />
</exec> </exec>