Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 <tokenfilter> | |
| 59 <replacestring from=" " to=";"/> | |
|
cjhopman
2013/10/22 21:22:27
Ant documentation says that replacestring can be u
| |
| 60 </tokenfilter> | |
| 61 </filterchain> | |
| 62 </loadresource> | |
| 63 <!-- Set to empty if not set by the loadresource above --> | |
| 64 <property name="project.library.packages" value=""/> | |
| 58 | 65 |
| 59 <path id="project.library.manifest.file.path"> | 66 <path id="project.library.manifest.file.path"> |
| 60 <filelist files="${LIBRARY_MANIFEST_PATHS}"/> | 67 <filelist files="${LIBRARY_MANIFEST_PATHS}"/> |
| 61 </path> | 68 </path> |
| 62 | 69 |
| 63 <!-- manifest merger default value --> | 70 <!-- manifest merger default value --> |
| 64 <condition property="manifestmerger.enabled" | 71 <condition property="manifestmerger.enabled" |
| 65 value="false" | 72 value="false" |
| 66 else="true"> | 73 else="true"> |
| 67 <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" /> | 74 <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" /> |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 ignoreAssets="${aapt.ignore.assets}" | 112 ignoreAssets="${aapt.ignore.assets}" |
| 106 binFolder="${out.absolute.dir}" | 113 binFolder="${out.absolute.dir}" |
| 107 proguardFile="${out.absolute.dir}/proguard.txt"> | 114 proguardFile="${out.absolute.dir}/proguard.txt"> |
| 108 <res path="${out.res.absolute.dir}" /> | 115 <res path="${out.res.absolute.dir}" /> |
| 109 <res path="${resource.absolute.dir}" /> | 116 <res path="${resource.absolute.dir}" /> |
| 110 </aapt> | 117 </aapt> |
| 111 | 118 |
| 112 <touch file="${STAMP}" /> | 119 <touch file="${STAMP}" /> |
| 113 </target> | 120 </target> |
| 114 </project> | 121 </project> |
| OLD | NEW |