diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-31 12:59:17 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-31 12:59:17 -0700 |
| commit | ba6508c7edcd34d9daa8bc373d44040e13072b01 (patch) | |
| tree | 3ac399230475f513060e7ba5acd7d5d30a9b344d /files | |
| parent | a4635be3ab6931ccf88e09a26e2044ea3e0b6ca4 (diff) | |
| parent | 7a12704dcdebc28cd728f2b2ebc9e8115b9c6985 (diff) | |
| download | sdk-ba6508c7edcd34d9daa8bc373d44040e13072b01.zip sdk-ba6508c7edcd34d9daa8bc373d44040e13072b01.tar.gz sdk-ba6508c7edcd34d9daa8bc373d44040e13072b01.tar.bz2 | |
resolve conflict from tools_r7
Change-Id: I5f416c6e77def15fdc6ae1022bbfe3033a6992ef
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/ant_rules_r3.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/files/ant/ant_rules_r3.xml b/files/ant/ant_rules_r3.xml index 7848862..2ac5742 100644 --- a/files/ant/ant_rules_r3.xml +++ b/files/ant/ant_rules_r3.xml @@ -436,11 +436,15 @@ <echo>and run zipalign from the Android SDK tools.</echo> </target> + <target name="-set-release-mode"> + <property name="build.mode.release" value="true"/> + </target> + <!-- This runs -package-release and -release-nosign first and then runs only if release-sign is true (set in -release-check, called by -release-no-sign)--> <target name="release" - depends="-package-release, -release-prompt-for-password, -release-nosign" + depends="-set-release-mode, -package-release, -release-prompt-for-password, -release-nosign" if="has.keystore" description="Builds the application. The generated apk file must be signed before it is published."> |