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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/ant/apk-codegen.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-package-resources.xml
diff --git a/build/android/ant/apk-package-resources.xml b/build/android/ant/apk-package-resources.xml
index 3bfd3c9d30319bbefeec3453f34dc6aa7cdf1f05..b716c16a5cba0ca31b992dd8c0a2999c1ca7c0b3 100644
--- a/build/android/ant/apk-package-resources.xml
+++ b/build/android/ant/apk-package-resources.xml
@@ -71,7 +71,7 @@
list the res folders in project.library.res.folder.path and the
corresponding java packages in project.library.packages, which must be
semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence
- the javascript task.
+ the replacestring filterchain task.
-->
<path id="project.library.res.folder.path">
<filelist files="${ADDITIONAL_RES_DIRS}"/>
@@ -79,10 +79,15 @@
<path id="project.library.bin.r.file.path">
<filelist files="${ADDITIONAL_R_TEXT_FILES}"/>
</path>
- <script language="javascript">
- var before = project.getProperty("ADDITIONAL_RES_PACKAGES");
- project.setProperty("project.library.packages", before.replaceAll(" ", ";"));
- </script>
+
+ <loadresource property="project.library.packages">
+ <propertyresource name="ADDITIONAL_RES_PACKAGES"/>
+ <filterchain>
+ <replacestring from=" " to=";"/>
+ </filterchain>
+ </loadresource>
+ <!-- Set to empty if not set by the loadresource above -->
+ <property name="project.library.packages" value=""/>
<property name="build.packaging.nocrunch" value="true" />
« 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