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

Side by Side Diff: build/android/ant/apk-package.xml

Issue 212173003: android: Do not pass source_dir to package_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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/java_apk.gypi » ('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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
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="${APK_NAME}.ap_" /> 54 <property name="resource.package.file.name" value="${APK_NAME}.ap_" />
55 55
56 <property name="dex.file.name" value="classes.dex" /> 56 <property name="dex.file.name" value="classes.dex" />
57 <property name="intermediate.dex.file" location="${out.absolute.dir}/${dex.fil e.name}" /> 57 <property name="intermediate.dex.file" location="${out.absolute.dir}/${dex.fil e.name}" />
58 58
59 <property name="source.dir" value="${SOURCE_DIR}" />
60 <property name="source.absolute.dir" location="${source.dir}" />
61
62 <!-- Macro that enables passing a variable list of external jar files 59 <!-- Macro that enables passing a variable list of external jar files
63 to ApkBuilder. --> 60 to ApkBuilder. -->
64 <macrodef name="package-helper"> 61 <macrodef name="package-helper">
65 <element name="extra-jars" optional="yes" /> 62 <element name="extra-jars" optional="yes" />
66 <sequential> 63 <sequential>
67 <apkbuilder 64 <apkbuilder
68 outfolder="${out.absolute.dir}" 65 outfolder="${out.absolute.dir}"
69 resourcefile="${resource.package.file.name}" 66 resourcefile="${resource.package.file.name}"
70 apkfilepath="${out.packaged.file}" 67 apkfilepath="${out.packaged.file}"
71 debugpackaging="${build.is.packaging.debug}" 68 debugpackaging="${build.is.packaging.debug}"
72 debugsigning="${build.is.signing.debug}" 69 debugsigning="${build.is.signing.debug}"
73 verbose="${verbose}" 70 verbose="${verbose}"
74 hascode="true" 71 hascode="true"
75 previousBuildType="/" 72 previousBuildType="/"
76 buildType="${build.is.packaging.debug}/${build.is.signing.debug}"> 73 buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
77 <dex path="${intermediate.dex.file}"/> 74 <dex path="${intermediate.dex.file}"/>
78 <sourcefolder path="${source.absolute.dir}"/>
79 <nativefolder path="${native.libs.absolute.dir}" /> 75 <nativefolder path="${native.libs.absolute.dir}" />
80 <extra-jars/> 76 <extra-jars/>
81 </apkbuilder> 77 </apkbuilder>
82 </sequential> 78 </sequential>
83 </macrodef> 79 </macrodef>
84 80
85 81
86 <!-- Packages the application. --> 82 <!-- Packages the application. -->
87 <target name="-package"> 83 <target name="-package">
88 <if condition="${emma.enabled}"> 84 <if condition="${emma.enabled}">
89 <then> 85 <then>
90 <package-helper> 86 <package-helper>
91 <extra-jars> 87 <extra-jars>
92 <jarfile path="${emma.device.jar}" /> 88 <jarfile path="${emma.device.jar}" />
93 </extra-jars> 89 </extra-jars>
94 </package-helper> 90 </package-helper>
95 </then> 91 </then>
96 <else> 92 <else>
97 <package-helper /> 93 <package-helper />
98 </else> 94 </else>
99 </if> 95 </if>
100 </target> 96 </target>
101 </project> 97 </project>
OLDNEW
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698