| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 <script language="javascript"> | 56 <script language="javascript"> |
| 57 var before = project.getProperty("ADDITIONAL_RES_PACKAGES"); | 57 var before = project.getProperty("ADDITIONAL_RES_PACKAGES"); |
| 58 project.setProperty("project.library.packages", before.replaceAll(" ", ";"))
; | 58 project.setProperty("project.library.packages", before.replaceAll(" ", ";"))
; |
| 59 </script> | 59 </script> |
| 60 | 60 |
| 61 <path id="project.library.manifest.file.path"> | 61 <path id="project.library.manifest.file.path"> |
| 62 <filelist files="${LIBRARY_MANIFEST_PATHS}"/> | 62 <filelist files="${LIBRARY_MANIFEST_PATHS}"/> |
| 63 </path> | 63 </path> |
| 64 | 64 |
| 65 <!-- manifest merger default value --> | 65 <!-- manifest merger default value --> |
| 66 <property name="manifestmerger.enabled" value="false" /> | 66 <condition property="manifestmerger.enabled" |
| 67 value="false" |
| 68 else="true"> |
| 69 <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" /> |
| 70 </condition> |
| 67 | 71 |
| 68 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/> | 72 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/> |
| 69 | 73 |
| 70 <property name="manifest.file" value="${ANDROID_MANIFEST}" /> | 74 <property name="manifest.file" value="${ANDROID_MANIFEST}" /> |
| 71 <property name="manifest.abs.file" location="${manifest.file}" /> | 75 <property name="manifest.abs.file" location="${manifest.file}" /> |
| 72 | 76 |
| 73 <!-- Intermediate files --> | 77 <!-- Intermediate files --> |
| 74 <property name="resource.package.file.name" value="${APK_NAME}.ap_" /> | 78 <property name="resource.package.file.name" value="${APK_NAME}.ap_" /> |
| 75 | 79 |
| 76 <property name="aapt.ignore.assets" value="" /> | 80 <property name="aapt.ignore.assets" value="" /> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 103 ignoreAssets="${aapt.ignore.assets}" | 107 ignoreAssets="${aapt.ignore.assets}" |
| 104 binFolder="${out.absolute.dir}" | 108 binFolder="${out.absolute.dir}" |
| 105 proguardFile="${out.absolute.dir}/proguard.txt"> | 109 proguardFile="${out.absolute.dir}/proguard.txt"> |
| 106 <res path="${out.res.absolute.dir}" /> | 110 <res path="${out.res.absolute.dir}" /> |
| 107 <res path="${resource.absolute.dir}" /> | 111 <res path="${resource.absolute.dir}" /> |
| 108 </aapt> | 112 </aapt> |
| 109 | 113 |
| 110 <touch file="${STAMP}" /> | 114 <touch file="${STAMP}" /> |
| 111 </target> | 115 </target> |
| 112 </project> | 116 </project> |
| OLD | NEW |