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

Unified Diff: build/android/ant/apk-codegen.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 | « no previous file | build/android/ant/apk-package-resources.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/ant/apk-codegen.xml
diff --git a/build/android/ant/apk-codegen.xml b/build/android/ant/apk-codegen.xml
index 37abb077f1958e760d72d4d56757132992c1c7c2..f9b717141ef9be779845b0b5d65e62c2b77366bb 100644
--- a/build/android/ant/apk-codegen.xml
+++ b/build/android/ant/apk-codegen.xml
@@ -43,7 +43,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}"/>
@@ -51,10 +51,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=""/>
<path id="project.library.manifest.file.path">
<filelist files="${LIBRARY_MANIFEST_PATHS}"/>
« no previous file with comments | « no previous file | build/android/ant/apk-package-resources.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698