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

Side by Side Diff: build/android/ant/sdk-targets.xml

Issue 10959027: Make apk targets remove .class files before compile (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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) 2012 The Chromium Authors. All rights reserved. 3 Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 <project name="chrome_sdk_overrides" > 7 <project name="chrome_sdk_overrides" >
8 <!-- 8 <!--
9 Redefinition of targets used by SDK tools. 9 Redefinition of targets used by SDK tools.
10 Supported version: SDK tools revision 20. 10 Supported version: SDK tools revision 20.
11 11
12 SDK tools do not allow easy way of extending classpaths 12 SDK tools do not allow easy way of extending classpaths
13 for aidl and javac. This file defines targets which can be used to 13 for aidl and javac. This file defines targets which can be used to
14 override targets used by tools. 14 override targets used by tools.
15 --> 15 -->
16 <target name="-pre-compile">
17 <!--
18 Remove all .class files from the output directory. This prevents inclusion of incorrect .class
19 files in the final apk. For example, if a .java file was deleted, the apk should not contain
20 the .class files for that .java from previous builds.
21 -->
22 <delete>
23 <fileset dir="${out.classes.absolute.dir}" includes="**/*.class"/>
24 </delete>
25 </target>
26
16 <!-- 27 <!--
17 Override the -compile target. 28 Override the -compile target.
18 This target requires 'javac.custom.classpath' to be set to reference 29 This target requires 'javac.custom.classpath' to be set to reference
19 of classpath to be used for javac. Also accepts custom path for 30 of classpath to be used for javac. Also accepts custom path for
20 sources: 'javac.custom.sourcepath'. 31 sources: 'javac.custom.sourcepath'.
21 --> 32 -->
22 <target 33 <target
23 name="-compile" 34 name="-compile"
24 depends="-build-setup, -pre-build, -code-gen, -pre-compile"> 35 depends="-build-setup, -pre-build, -code-gen, -pre-compile">
25 <do-only-if-manifest-hasCode elseText="hasCode = false. Skipping..." > 36 <do-only-if-manifest-hasCode elseText="hasCode = false. Skipping..." >
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 <!-- Zip aligns the APK --> 162 <!-- Zip aligns the APK -->
152 <zipalign-helper 163 <zipalign-helper
153 in.package="${out.unaligned.file}" 164 in.package="${out.unaligned.file}"
154 out.package="${out.final.file}" /> 165 out.package="${out.final.file}" />
155 <echo level="info">Release Package: ${out.final.file}</echo> 166 <echo level="info">Release Package: ${out.final.file}</echo>
156 </sequential> 167 </sequential>
157 </do-only-if-not-library> 168 </do-only-if-not-library>
158 <record-build-info /> 169 <record-build-info />
159 </target> 170 </target>
160 </project> 171 </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