Chromium Code Reviews| 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..1ee1529340824cae33a3a63648cf887205466fee 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,17 @@ |
| <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> |
| + <tokenfilter> |
| + <replacestring from=" " to=";"/> |
|
cjhopman
2013/10/22 21:22:27
Ant documentation says that replacestring can be u
|
| + </tokenfilter> |
| + </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}"/> |