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

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

Issue 35473002: Replacing the javascript jar file merge with pure ant (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecesary tokenfilter wrapper around replacestring Created 7 years, 2 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 | build/android/ant/apk-obfuscate.xml » ('j') | 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 </src> 115 </src>
116 <compilerarg value="-Xlint:unchecked"/> 116 <compilerarg value="-Xlint:unchecked"/>
117 <compilerarg line="${java.compilerargs}"/> 117 <compilerarg line="${java.compilerargs}"/>
118 </javac> 118 </javac>
119 119
120 <if condition="${project.is.testapp}"> 120 <if condition="${project.is.testapp}">
121 <then> 121 <then>
122 <!-- get the project manifest package --> 122 <!-- get the project manifest package -->
123 <xpath input="${out.manifest.abs.file}" 123 <xpath input="${out.manifest.abs.file}"
124 expression="/manifest/@package" output="project.app.package" /> 124 expression="/manifest/@package" output="project.app.package" />
125 <property name="create.test.jar.file" 125 <loadresource property="project.app.packagepath">
126 location="${CREATE_TEST_JAR_PATH}" /> 126 <propertyresource name="project.app.package"/>
127 <script language="javascript" src="${create.test.jar.file}"/> 127 <filterchain>
128 <replacestring from="." to="/"/>
129 </filterchain>
130 </loadresource>
131 <property name="create.test.jar.exclusions"
132 value="${project.app.packagepath}/R.class ${project.app.packag epath}/R$*.class ${project.app.packagepath}/Manifest.class ${project.app.package path}/Manifest$*.class ${project.app.packagepath}/BuildConfig.class"/>
133 <jar destfile="${TEST_JAR_PATH}"
134 excludes="${create.test.jar.exclusions}"
135 duplicate="preserve"
136 >
137 <restrict>
138 <name name="**/*.class"/>
139 <archives>
140 <zips>
141 <path refid="javac.custom.classpath"/>
142 </zips>
143 </archives>
144 </restrict>
145 <fileset dir="${out.dir}/classes"/>
146 </jar>
128 </then> 147 </then>
129 </if> 148 </if>
130 149
131 <!-- Package all the compiled .class files into a .jar. --> 150 <!-- Package all the compiled .class files into a .jar. -->
132 <jar 151 <jar
133 jarfile="${JAR_PATH}" 152 jarfile="${JAR_PATH}"
134 basedir="${out.classes.absolute.dir}" 153 basedir="${out.classes.absolute.dir}"
135 /> 154 />
136 </target> 155 </target>
137 156
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 dexedlibs="${out.dexed.absolute.dir}" 257 dexedlibs="${out.dexed.absolute.dir}"
239 nolocals="false" 258 nolocals="false"
240 forceJumbo="${dex.force.jumbo}" 259 forceJumbo="${dex.force.jumbo}"
241 verbose="${verbose}"> 260 verbose="${verbose}">
242 <path path="${out.dex.input.absolute.dir}"/> 261 <path path="${out.dex.input.absolute.dir}"/>
243 <path refid="out.dex.jar.input.ref" /> 262 <path refid="out.dex.jar.input.ref" />
244 </dex> 263 </dex>
245 <touch file="${STAMP}" /> 264 <touch file="${STAMP}" />
246 </target> 265 </target>
247 </project> 266 </project>
OLDNEW
« no previous file with comments | « no previous file | build/android/ant/apk-obfuscate.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698