Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: build/android/ant/apk-build.xml

Issue 12735007: Set the ant keystore properties earlier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 Copyright (C) 2005-2008 The Android Open Source Project 3 Copyright (C) 2005-2008 The Android Open Source Project
4 4
5 Licensed under the Apache License, Version 2.0 (the "License"); 5 Licensed under the Apache License, Version 2.0 (the "License");
6 you may not use this file except in compliance with the License. 6 you may not use this file except in compliance with the License.
7 You may obtain a copy of the License at 7 You may obtain a copy of the License at
8 8
9 http://www.apache.org/licenses/LICENSE-2.0 9 http://www.apache.org/licenses/LICENSE-2.0
10 10
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 <property name="out.build.prop.file" location="${out.absolute.dir}/build.pro p" /> 255 <property name="out.build.prop.file" location="${out.absolute.dir}/build.pro p" />
256 256
257 257
258 <!-- This is needed by emma as it uses multilevel verbosity instead of simpl e 'true' or 'false' 258 <!-- This is needed by emma as it uses multilevel verbosity instead of simpl e 'true' or 'false'
259 The property 'verbosity' is not user configurable and depends exclusive ly on 'verbose' 259 The property 'verbosity' is not user configurable and depends exclusive ly on 'verbose'
260 value.--> 260 value.-->
261 <condition property="verbosity" value="verbose" else="quiet"> 261 <condition property="verbosity" value="verbose" else="quiet">
262 <istrue value="${verbose}" /> 262 <istrue value="${verbose}" />
263 </condition> 263 </condition>
264 264
265 <!--
266 For debug builds, the Android SDK tools create a key in ~/.android and sig n the build with it.
267 This has caused all kinds of issues. Instead, the debug build should be si gned with a key in
268 build/android/ant. The SDK tools do not provide any support for overriding that behavior and so
269 instead one must use the hack below.
270 -->
271 <property name="key.store" value="${CHROMIUM_SRC}/build/android/ant/chromium -debug.keystore"/>
272 <property name="key.store.password" value="chromium"/>
273 <property name="key.alias" value="chromiumdebugkey"/>
274 <property name="key.alias.password" value="chromium"/>
275
276
265 <!-- properties for signing in release mode --> 277 <!-- properties for signing in release mode -->
266 <condition property="has.keystore"> 278 <condition property="has.keystore">
267 <and> 279 <and>
268 <isset property="key.store" /> 280 <isset property="key.store" />
269 <length string="${key.store}" when="greater" length="0" /> 281 <length string="${key.store}" when="greater" length="0" />
270 <isset property="key.alias" /> 282 <isset property="key.alias" />
271 </and> 283 </and>
272 </condition> 284 </condition>
273 <condition property="has.password"> 285 <condition property="has.password">
274 <and> 286 <and>
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 <!-- Renderscript optimization level: none --> 1157 <!-- Renderscript optimization level: none -->
1146 <property name="renderscript.opt.level" value="${renderscript.debug.opt. level}" /> 1158 <property name="renderscript.opt.level" value="${renderscript.debug.opt. level}" />
1147 1159
1148 </target> 1160 </target>
1149 1161
1150 <target name="-debug-obfuscation-check"> 1162 <target name="-debug-obfuscation-check">
1151 <!-- proguard is never enabled in debug mode --> 1163 <!-- proguard is never enabled in debug mode -->
1152 <property name="proguard.enabled" value="false"/> 1164 <property name="proguard.enabled" value="false"/>
1153 </target> 1165 </target>
1154 1166
1155 <!--
1156 For debug builds, the Android SDK tools create a key in ~/.android and sig n the build with it.
1157 This has caused all kinds of issues. Instead, the debug build should be si gned with a key in
1158 build/android/ant. The SDK tools do not provide any support for overriding that behavior and so
1159 instead one must use the hack below.
1160 -->
1161 <property name="key.store" value="${CHROMIUM_SRC}/build/android/ant/chromium -debug.keystore"/>
1162 <property name="key.store.password" value="chromium"/>
1163 <property name="key.alias" value="chromiumdebugkey"/>
1164 <property name="key.alias.password" value="chromium"/>
1165
1166 <!-- SDK tools assume that out.packaged.file is signed and name it "...-unal igned" --> 1167 <!-- SDK tools assume that out.packaged.file is signed and name it "...-unal igned" -->
1167 <property name="out.packaged.file" 1168 <property name="out.packaged.file"
1168 value="${apks.dir}/${ant.project.name}-unsigned.apk" /> 1169 value="${apks.dir}/${ant.project.name}-unsigned.apk" />
1169 <property name="out.unaligned.file" 1170 <property name="out.unaligned.file"
1170 value="${apks.dir}/${ant.project.name}-unaligned.apk" /> 1171 value="${apks.dir}/${ant.project.name}-unaligned.apk" />
1171 1172
1172 <!-- By default, the SDK tools build only aligns the APK in the -do-debug ta rget. --> 1173 <!-- By default, the SDK tools build only aligns the APK in the -do-debug ta rget. -->
1173 <!-- Builds debug output package --> 1174 <!-- Builds debug output package -->
1174 <target name="-do-debug" 1175 <target name="-do-debug"
1175 depends="-set-debug-mode, -debug-obfuscation-check, -package, -post-pack age"> 1176 depends="-set-debug-mode, -debug-obfuscation-check, -package, -post-pack age">
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
1683 <echo> installd: Installs (only) the debug package.</echo> 1684 <echo> installd: Installs (only) the debug package.</echo>
1684 <echo> installr: Installs (only) the release package.</echo> 1685 <echo> installr: Installs (only) the release package.</echo>
1685 <echo> installi: Installs (only) the instrumented package.</echo> 1686 <echo> installi: Installs (only) the instrumented package.</echo>
1686 <echo> installt: Installs (only) the test and tested packages (unless </echo> 1687 <echo> installt: Installs (only) the test and tested packages (unless </echo>
1687 <echo> nodeps is used as well.</echo> 1688 <echo> nodeps is used as well.</echo>
1688 <echo> uninstall: Uninstalls the application from a running emulator o r</echo> 1689 <echo> uninstall: Uninstalls the application from a running emulator o r</echo>
1689 <echo> device. Also uninstall tested package if applicable< /echo> 1690 <echo> device. Also uninstall tested package if applicable< /echo>
1690 <echo> unless 'nodeps' is used as well.</echo> 1691 <echo> unless 'nodeps' is used as well.</echo>
1691 </target> 1692 </target>
1692 </project> 1693 </project>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698