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

Side by Side Diff: build/android/ant/apk-obfuscate.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 | « build/android/ant/apk-compile.xml ('k') | 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 <!-- 62 <!--
63 Override obfuscate target to pass javac.custom.classpath to Proguard. SDK to ols do not provide 63 Override obfuscate target to pass javac.custom.classpath to Proguard. SDK to ols do not provide
64 any way to pass custom class paths to Proguard. 64 any way to pass custom class paths to Proguard.
65 --> 65 -->
66 <target name="-obfuscate"> 66 <target name="-obfuscate">
67 <if condition="${project.is.testapp}"> 67 <if condition="${project.is.testapp}">
68 <then> 68 <then>
69 <!-- get the project manifest package --> 69 <!-- get the project manifest package -->
70 <xpath input="${out.manifest.abs.file}" 70 <xpath input="${out.manifest.abs.file}"
71 expression="/manifest/@package" output="project.app.package" /> 71 expression="/manifest/@package" output="project.app.package" />
72 <property name="create.test.jar.file" 72 <loadresource property="project.app.packagepath">
73 location="${CREATE_TEST_JAR_PATH}" /> 73 <propertyresource name="project.app.package"/>
74 <script language="javascript" src="${create.test.jar.file}"/> 74 <filterchain>
75 <replacestring from="." to="/"/>
76 </filterchain>
77 </loadresource>
78 <property name="create.test.jar.exclusions" value="${project.app.package path}/R.class ${project.app.packagepath}/R$*.class ${project.app.packagepath}/Ma nifest.class ${project.app.packagepath}/Manifest$*.class ${project.app.packagepa th}/BuildConfig.class"/>
79 <jar destfile="${TEST_JAR_PATH}"
80 excludes="${create.test.jar.exclusions}"
81 duplicate="preserve"
82 >
83 <restrict>
84 <name name="**/*.class"/>
85 <archives>
86 <zips>
87 <path refid="javac.custom.classpath"/>
88 </zips>
89 </archives>
90 </restrict>
91 <fileset dir="${out.dir}/classes"/>
92 </jar>
75 </then> 93 </then>
76 </if> 94 </if>
77 <if> 95 <if>
78 <condition> 96 <condition>
79 <and> 97 <and>
80 <istrue value="${proguard.enabled}"/> 98 <istrue value="${proguard.enabled}"/>
81 <equals arg1="${CONFIGURATION_NAME}" arg2="Release"/> 99 <equals arg1="${CONFIGURATION_NAME}" arg2="Release"/>
82 </and> 100 </and>
83 </condition> 101 </condition>
84 <then> 102 <then>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 -dump "${obfuscate.absolute.dir}/dump.txt" 165 -dump "${obfuscate.absolute.dir}/dump.txt"
148 -printseeds "${obfuscate.absolute.dir}/seeds.txt" 166 -printseeds "${obfuscate.absolute.dir}/seeds.txt"
149 -printusage "${obfuscate.absolute.dir}/usage.txt" 167 -printusage "${obfuscate.absolute.dir}/usage.txt"
150 -printmapping "${obfuscate.absolute.dir}/mapping.txt" 168 -printmapping "${obfuscate.absolute.dir}/mapping.txt"
151 </proguard> 169 </proguard>
152 </then> 170 </then>
153 </if> 171 </if>
154 <touch file="${STAMP}" /> 172 <touch file="${STAMP}" />
155 </target> 173 </target>
156 </project> 174 </project>
OLDNEW
« no previous file with comments | « build/android/ant/apk-compile.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698