| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 <!-- SDK tools assume that out.packaged.file is signed and name it "...-unalig
ned" --> | 48 <!-- SDK tools assume that out.packaged.file is signed and name it "...-unalig
ned" --> |
| 49 <property name="out.packaged.file" value="${UNSIGNED_APK_PATH}" /> | 49 <property name="out.packaged.file" value="${UNSIGNED_APK_PATH}" /> |
| 50 | 50 |
| 51 <property name="native.libs.absolute.dir" location="${NATIVE_LIBS_DIR}" /> | 51 <property name="native.libs.absolute.dir" location="${NATIVE_LIBS_DIR}" /> |
| 52 | 52 |
| 53 <!-- Intermediate files --> | 53 <!-- Intermediate files --> |
| 54 <property name="resource.package.file.name" value="${RESOURCE_PACKAGED_APK_NAM
E}" /> | 54 <property name="resource.package.file.name" value="${RESOURCE_PACKAGED_APK_NAM
E}" /> |
| 55 | 55 |
| 56 <property name="intermediate.dex.file" location="${DEX_FILE_PATH}" /> | 56 <property name="intermediate.dex.file" location="${DEX_FILE_PATH}" /> |
| 57 <condition property="multidex.enabled" value="true"> |
| 58 <equals arg1="${MULTIDEX_ENABLED}" arg2="1"/> |
| 59 </condition> |
| 57 | 60 |
| 58 <!-- Macro that enables passing a variable list of external jar files | 61 <!-- Macro that enables passing a variable list of external jar files |
| 59 to ApkBuilder. --> | 62 to ApkBuilder. --> |
| 60 <macrodef name="package-helper"> | 63 <macrodef name="package-helper"> |
| 61 <element name="extra-jars" optional="yes" /> | 64 <element name="extra-jars" optional="yes" /> |
| 62 <sequential> | 65 <sequential> |
| 63 <apkbuilder | 66 <apkbuilder |
| 64 outfolder="${out.absolute.dir}" | 67 outfolder="${out.absolute.dir}" |
| 65 resourcefile="${resource.package.file.name}" | 68 resourcefile="${resource.package.file.name}" |
| 66 apkfilepath="${out.packaged.file}" | 69 apkfilepath="${out.packaged.file}" |
| 67 debugpackaging="${build.is.packaging.debug}" | 70 debugpackaging="${build.is.packaging.debug}" |
| 68 debugsigning="${build.is.signing.debug}" | 71 debugsigning="${build.is.signing.debug}" |
| 69 verbose="${verbose}" | 72 verbose="${verbose}" |
| 70 hascode="${HAS_CODE}" | 73 hascode="${HAS_CODE}" |
| 71 previousBuildType="/" | 74 previousBuildType="/" |
| 72 buildType="${build.is.packaging.debug}/${build.is.signing.debug}"> | 75 buildType="${build.is.packaging.debug}/${build.is.signing.debug}"> |
| 73 <dex path="${intermediate.dex.file}"/> | 76 <dex path="${intermediate.dex.file}" /> |
| 74 <nativefolder path="${native.libs.absolute.dir}" /> | 77 <nativefolder path="${native.libs.absolute.dir}" /> |
| 75 <extra-jars/> | 78 <extra-jars/> |
| 76 </apkbuilder> | 79 </apkbuilder> |
| 77 </sequential> | 80 </sequential> |
| 78 </macrodef> | 81 </macrodef> |
| 79 | 82 |
| 83 <macrodef name="multidex-package-helper"> |
| 84 <element name="extra-jars" optional="yes" /> |
| 85 <sequential> |
| 86 <apkbuilder |
| 87 outfolder="${out.absolute.dir}" |
| 88 resourcefile="${resource.package.file.name}" |
| 89 apkfilepath="${out.packaged.file}" |
| 90 debugpackaging="${build.is.packaging.debug}" |
| 91 debugsigning="${build.is.signing.debug}" |
| 92 verbose="${verbose}" |
| 93 hascode="false" |
| 94 previousBuildType="/" |
| 95 buildType="${build.is.packaging.debug}/${build.is.signing.debug}"> |
| 96 <zip path="${intermediate.dex.file}" /> |
| 97 <nativefolder path="${native.libs.absolute.dir}" /> |
| 98 <extra-jars/> |
| 99 </apkbuilder> |
| 100 </sequential> |
| 101 </macrodef> |
| 80 | 102 |
| 81 <!-- Packages the application. --> | 103 <!-- Packages the application. --> |
| 82 <target name="-package"> | 104 <target name="-package"> |
| 83 <if condition="${emma.enabled}"> | 105 <if condition="${emma.enabled}"> |
| 84 <then> | 106 <then> |
| 85 <package-helper> | 107 <package-helper> |
| 86 <extra-jars> | 108 <extra-jars> |
| 87 <jarfile path="${emma.device.jar}" /> | 109 <jarfile path="${emma.device.jar}" /> |
| 88 </extra-jars> | 110 </extra-jars> |
| 89 </package-helper> | 111 </package-helper> |
| 90 </then> | 112 </then> |
| 91 <else> | 113 <else> |
| 92 <package-helper /> | 114 <if condition="${multidex.enabled}"> |
| 115 <then> |
| 116 <echo message="multidex enabled" /> |
| 117 <multidex-package-helper /> |
| 118 </then> |
| 119 <else> |
| 120 <echo message="multidex disabled" /> |
| 121 <package-helper /> |
| 122 </else> |
| 123 </if> |
| 93 </else> | 124 </else> |
| 94 </if> | 125 </if> |
| 95 </target> | 126 </target> |
| 96 </project> | 127 </project> |
| OLD | NEW |