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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/android/ant/apk-package-resources.xml » ('j') | 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 25 matching lines...) Expand all
36 </path> 36 </path>
37 37
38 <!-- Custom tasks --> 38 <!-- Custom tasks -->
39 <taskdef resource="anttasks.properties" classpathref="android.antlibs" /> 39 <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
40 40
41 <!-- 41 <!--
42 Include additional resource folders in the apk, e.g. content/.../res. We 42 Include additional resource folders in the apk, e.g. content/.../res. We
43 list the res folders in project.library.res.folder.path and the 43 list the res folders in project.library.res.folder.path and the
44 corresponding java packages in project.library.packages, which must be 44 corresponding java packages in project.library.packages, which must be
45 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence 45 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence
46 the javascript task. 46 the replacestring filterchain task.
47 --> 47 -->
48 <path id="project.library.res.folder.path"> 48 <path id="project.library.res.folder.path">
49 <filelist files="${ADDITIONAL_RES_DIRS}"/> 49 <filelist files="${ADDITIONAL_RES_DIRS}"/>
50 </path> 50 </path>
51 <path id="project.library.bin.r.file.path"> 51 <path id="project.library.bin.r.file.path">
52 <filelist files="${ADDITIONAL_R_TEXT_FILES}"/> 52 <filelist files="${ADDITIONAL_R_TEXT_FILES}"/>
53 </path> 53 </path>
54 <script language="javascript"> 54
55 var before = project.getProperty("ADDITIONAL_RES_PACKAGES"); 55 <loadresource property="project.library.packages">
56 project.setProperty("project.library.packages", before.replaceAll(" ", ";")) ; 56 <propertyresource name="ADDITIONAL_RES_PACKAGES"/>
57 </script> 57 <filterchain>
58 <replacestring from=" " to=";"/>
59 </filterchain>
60 </loadresource>
61 <!-- Set to empty if not set by the loadresource above -->
62 <property name="project.library.packages" value=""/>
58 63
59 <path id="project.library.manifest.file.path"> 64 <path id="project.library.manifest.file.path">
60 <filelist files="${LIBRARY_MANIFEST_PATHS}"/> 65 <filelist files="${LIBRARY_MANIFEST_PATHS}"/>
61 </path> 66 </path>
62 67
63 <!-- manifest merger default value --> 68 <!-- manifest merger default value -->
64 <condition property="manifestmerger.enabled" 69 <condition property="manifestmerger.enabled"
65 value="false" 70 value="false"
66 else="true"> 71 else="true">
67 <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" /> 72 <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" />
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 ignoreAssets="${aapt.ignore.assets}" 110 ignoreAssets="${aapt.ignore.assets}"
106 binFolder="${out.absolute.dir}" 111 binFolder="${out.absolute.dir}"
107 proguardFile="${out.absolute.dir}/proguard.txt"> 112 proguardFile="${out.absolute.dir}/proguard.txt">
108 <res path="${out.res.absolute.dir}" /> 113 <res path="${out.res.absolute.dir}" />
109 <res path="${resource.absolute.dir}" /> 114 <res path="${resource.absolute.dir}" />
110 </aapt> 115 </aapt>
111 116
112 <touch file="${STAMP}" /> 117 <touch file="${STAMP}" />
113 </target> 118 </target>
114 </project> 119 </project>
OLDNEW
« 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