diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-10-21 18:39:59 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-10-21 18:39:59 -0700 |
| commit | 6451786c0308ff01e8290eaeb874d0c9650949ec (patch) | |
| tree | 49b4efebe3058d9259c80b7c387e30b6a2425319 /files | |
| parent | fb1f0942dc96d0bb2ef1b8a44458f377834b35e5 (diff) | |
| download | sdk-6451786c0308ff01e8290eaeb874d0c9650949ec.zip sdk-6451786c0308ff01e8290eaeb874d0c9650949ec.tar.gz sdk-6451786c0308ff01e8290eaeb874d0c9650949ec.tar.bz2 | |
Add nodeps support to install/uninstall.
Change-Id: Ia03a4c55567680a8365df8a83079c7d370747697
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml index 016e8dc..14192d8 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -367,7 +367,7 @@ <!-- target to disable building dependencies --> <target name="nodeps"> - <property name="dont.build.deps" value="true" /> + <property name="dont.do.deps" value="true" /> </target> <!-- this target simply force running -setup making @@ -473,7 +473,7 @@ <condition> <and> <isreference refid="project.libraries" /> - <not><isset property="dont.build.deps" /></not> + <not><isset property="dont.do.deps" /></not> </and> </condition> <then> @@ -1171,7 +1171,12 @@ <!-- can't use project.is.test since the setup target might not have run --> <if> <condition> - <isset property="tested.project.dir" /> + <and> + <isset property="tested.project.dir" /> + <not> + <isset property="dont.do.deps" /> + </not> + </and> </condition> <then> <property name="tested.project.absolute.dir" location="${tested.project.dir}" /> @@ -1247,7 +1252,12 @@ <!-- can't use project.is.test since the setup target might not have run --> <if> <condition> - <isset property="tested.project.dir" /> + <and> + <isset property="tested.project.dir" /> + <not> + <isset property="dont.do.deps" /> + </not> + </and> </condition> <then> <property name="tested.project.absolute.dir" location="${tested.project.dir}" /> @@ -1310,8 +1320,10 @@ <echo> installd: Installs (only) the debug package.</echo> <echo> installr: Installs (only) the release package.</echo> <echo> installi: Installs (only) the instrumented package.</echo> - <echo> installt: Installs (only) the test and tested packages.</echo> + <echo> installt: Installs (only) the test and tested packages (unless</echo> + <echo> nodeps is used as well.</echo> <echo> uninstall: Uninstalls the application from a running emulator or</echo> - <echo> device.</echo> + <echo> device. Also uninstall tested package if applicable</echo> + <echo> unless 'nodeps' is used as well.</echo> </target> </project> |