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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/ant/apk-compile.xml ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/ant/apk-obfuscate.xml
diff --git a/build/android/ant/apk-obfuscate.xml b/build/android/ant/apk-obfuscate.xml
index b15ce7365eb590d28a5ae75d4d911f9090c4da4b..4e737dae59ed936ac9b200456bd10288da7b6b55 100644
--- a/build/android/ant/apk-obfuscate.xml
+++ b/build/android/ant/apk-obfuscate.xml
@@ -69,9 +69,27 @@
<!-- get the project manifest package -->
<xpath input="${out.manifest.abs.file}"
expression="/manifest/@package" output="project.app.package" />
- <property name="create.test.jar.file"
- location="${CREATE_TEST_JAR_PATH}" />
- <script language="javascript" src="${create.test.jar.file}"/>
+ <loadresource property="project.app.packagepath">
+ <propertyresource name="project.app.package"/>
+ <filterchain>
+ <replacestring from="." to="/"/>
+ </filterchain>
+ </loadresource>
+ <property name="create.test.jar.exclusions" value="${project.app.packagepath}/R.class ${project.app.packagepath}/R$*.class ${project.app.packagepath}/Manifest.class ${project.app.packagepath}/Manifest$*.class ${project.app.packagepath}/BuildConfig.class"/>
+ <jar destfile="${TEST_JAR_PATH}"
+ excludes="${create.test.jar.exclusions}"
+ duplicate="preserve"
+ >
+ <restrict>
+ <name name="**/*.class"/>
+ <archives>
+ <zips>
+ <path refid="javac.custom.classpath"/>
+ </zips>
+ </archives>
+ </restrict>
+ <fileset dir="${out.dir}/classes"/>
+ </jar>
</then>
</if>
<if>
« 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