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

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

Issue 35023003: Change javascript string replace in ant files to pure ant using a filterchain with replacestring (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@java-normal
Patch Set: Remove the 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-codegen.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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 or "<file>" to match only files. Default is to match both. 64 or "<file>" to match only files. Default is to match both.
65 - Match is not case-sensitive. 65 - Match is not case-sensitive.
66 --> 66 -->
67 <property name="aapt.ignore.assets" value="" /> 67 <property name="aapt.ignore.assets" value="" />
68 68
69 <!-- 69 <!--
70 Include additional resource folders in the apk, e.g. content/.../res. We 70 Include additional resource folders in the apk, e.g. content/.../res. We
71 list the res folders in project.library.res.folder.path and the 71 list the res folders in project.library.res.folder.path and the
72 corresponding java packages in project.library.packages, which must be 72 corresponding java packages in project.library.packages, which must be
73 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, henc e 73 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, henc e
74 the javascript task. 74 the replacestring filterchain task.
75 --> 75 -->
76 <path id="project.library.res.folder.path"> 76 <path id="project.library.res.folder.path">
77 <filelist files="${ADDITIONAL_RES_DIRS}"/> 77 <filelist files="${ADDITIONAL_RES_DIRS}"/>
78 </path> 78 </path>
79 <path id="project.library.bin.r.file.path"> 79 <path id="project.library.bin.r.file.path">
80 <filelist files="${ADDITIONAL_R_TEXT_FILES}"/> 80 <filelist files="${ADDITIONAL_R_TEXT_FILES}"/>
81 </path> 81 </path>
82 <script language="javascript"> 82
83 var before = project.getProperty("ADDITIONAL_RES_PACKAGES"); 83 <loadresource property="project.library.packages">
84 project.setProperty("project.library.packages", before.replaceAll(" ", ";")) ; 84 <propertyresource name="ADDITIONAL_RES_PACKAGES"/>
85 </script> 85 <filterchain>
86 <replacestring from=" " to=";"/>
87 </filterchain>
88 </loadresource>
89 <!-- Set to empty if not set by the loadresource above -->
90 <property name="project.library.packages" value=""/>
86 91
87 <property name="build.packaging.nocrunch" value="true" /> 92 <property name="build.packaging.nocrunch" value="true" />
88 93
89 <!-- Intermediate files --> 94 <!-- Intermediate files -->
90 <property name="resource.package.file.name" value="${APK_NAME}.ap_" /> 95 <property name="resource.package.file.name" value="${APK_NAME}.ap_" />
91 96
92 <target name="-crunch"> 97 <target name="-crunch">
93 <!-- Updates the pre-processed PNG cache --> 98 <!-- Updates the pre-processed PNG cache -->
94 <exec executable="${aapt}" taskName="crunch"> 99 <exec executable="${aapt}" taskName="crunch">
95 <arg value="crunch" /> 100 <arg value="crunch" />
(...skipping 27 matching lines...) Expand all
123 ignoreAssets="${aapt.ignore.assets}"> 128 ignoreAssets="${aapt.ignore.assets}">
124 <res path="${out.res.absolute.dir}" /> 129 <res path="${out.res.absolute.dir}" />
125 <res path="${resource.absolute.dir}" /> 130 <res path="${resource.absolute.dir}" />
126 <!-- <nocompress /> forces no compression on any files in assets or res/ra w --> 131 <!-- <nocompress /> forces no compression on any files in assets or res/ra w -->
127 <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw --> 132 <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw -->
128 </aapt> 133 </aapt>
129 134
130 <touch file="${STAMP}" /> 135 <touch file="${STAMP}" />
131 </target> 136 </target>
132 </project> 137 </project>
OLDNEW
« no previous file with comments | « build/android/ant/apk-codegen.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698