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

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

Issue 1138953003: Extract apkbuilder build action into a .gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split-manifest
Patch Set: Created 5 years, 7 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/apkbuilder_action.gypi » ('j') | build/java_apk.gypi » ('J')
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 <macrodef name="package-helper"> 60 <macrodef name="package-helper">
61 <element name="extra-jars" optional="yes" /> 61 <element name="extra-jars" optional="yes" />
62 <sequential> 62 <sequential>
63 <apkbuilder 63 <apkbuilder
64 outfolder="${out.absolute.dir}" 64 outfolder="${out.absolute.dir}"
65 resourcefile="${resource.package.file.name}" 65 resourcefile="${resource.package.file.name}"
66 apkfilepath="${out.packaged.file}" 66 apkfilepath="${out.packaged.file}"
67 debugpackaging="${build.is.packaging.debug}" 67 debugpackaging="${build.is.packaging.debug}"
68 debugsigning="${build.is.signing.debug}" 68 debugsigning="${build.is.signing.debug}"
69 verbose="${verbose}" 69 verbose="${verbose}"
70 hascode="true" 70 hascode="${HAS_CODE}"
71 previousBuildType="/" 71 previousBuildType="/"
72 buildType="${build.is.packaging.debug}/${build.is.signing.debug}"> 72 buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
73 <dex path="${intermediate.dex.file}"/> 73 <dex path="${intermediate.dex.file}"/>
74 <nativefolder path="${native.libs.absolute.dir}" /> 74 <nativefolder path="${native.libs.absolute.dir}" />
75 <extra-jars/> 75 <extra-jars/>
76 </apkbuilder> 76 </apkbuilder>
77 </sequential> 77 </sequential>
78 </macrodef> 78 </macrodef>
79 79
80 80
81 <!-- Packages the application. --> 81 <!-- Packages the application. -->
82 <target name="-package"> 82 <target name="-package">
83 <if condition="${emma.enabled}"> 83 <if condition="${emma.enabled}">
84 <then> 84 <then>
85 <package-helper> 85 <package-helper>
86 <extra-jars> 86 <extra-jars>
87 <jarfile path="${emma.device.jar}" /> 87 <jarfile path="${emma.device.jar}" />
88 </extra-jars> 88 </extra-jars>
89 </package-helper> 89 </package-helper>
90 </then> 90 </then>
91 <else> 91 <else>
92 <package-helper /> 92 <package-helper />
93 </else> 93 </else>
94 </if> 94 </if>
95 </target> 95 </target>
96 </project> 96 </project>
OLDNEW
« no previous file with comments | « no previous file | build/android/apkbuilder_action.gypi » ('j') | build/java_apk.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698