diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-08-12 17:48:32 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2009-08-13 11:18:28 -0700 |
| commit | 5b13066ef1b430ceba97564b7a63a8d56406dbb3 (patch) | |
| tree | d0794592816a235282cccda1a69690bd7a6637a7 /tools/scripts | |
| parent | 9f30bb1c473890864104815c83725b314bb96df7 (diff) | |
| download | android_development-5b13066ef1b430ceba97564b7a63a8d56406dbb3.tar.gz android_development-5b13066ef1b430ceba97564b7a63a8d56406dbb3.tar.bz2 android_development-5b13066ef1b430ceba97564b7a63a8d56406dbb3.zip | |
On project creation, put the app package in build.properties
This enabled 'ant uninstall' to work.
Also, add an error message to the uninstall rules in case the property
is not defined.
BUG: 2050451
Diffstat (limited to 'tools/scripts')
| -rw-r--r-- | tools/scripts/android_rules.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/scripts/android_rules.xml b/tools/scripts/android_rules.xml index 1f5daac83..be532643e 100644 --- a/tools/scripts/android_rules.xml +++ b/tools/scripts/android_rules.xml @@ -201,7 +201,15 @@ </target> <!-- Uinstall the package from the default emulator --> - <target name="uninstall"> + <target name="uninstall.check"> + <condition property="uninstall.run"> + <isset property="application-package" /> + </condition> + </target> + <target name="uninstall.error" depends="uninstall.check" unless="uninstall.run"> + <echo>Unable to run 'ant unintall', application-package is not defined in build.properties</echo> + </target> + <target name="uninstall" depends="uninstall.error" if="uninstall.run"> <echo>Uninstalling ${application-package} from the default emulator...</echo> <exec executable="${adb}" failonerror="true"> <arg value="uninstall" /> |