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

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

Issue 21977003: Build changes for updating Android SDK to 4.3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Turns out we need ANDROID_SDK_VERSION in constants.py (findbugs uses it). Created 7 years, 4 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 | « build/android/ant/apk-obfuscate.xml ('k') | build/android/ant/apk-package-resources.xml » ('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
11 Unless required by applicable law or agreed to in writing, software 11 Unless required by applicable law or agreed to in writing, software
12 distributed under the License is distributed on an "AS IS" BASIS, 12 distributed under the License is distributed on an "AS IS" BASIS,
13 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 See the License for the specific language governing permissions and 14 See the License for the specific language governing permissions and
15 limitations under the License. 15 limitations under the License.
16 --> 16 -->
17 17
18 <project default="-package"> 18 <project default="-package">
19 <property name="verbose" value="false" /> 19 <property name="verbose" value="false" />
20 <property name="out.dir" location="${OUT_DIR}" /> 20 <property name="out.dir" location="${OUT_DIR}" />
21 <property name="out.absolute.dir" location="${out.dir}" /> 21 <property name="out.absolute.dir" location="${out.dir}" />
22 22
23 <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/> 23 <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
24 24
25 <!-- jar file from where the tasks are loaded --> 25 <!-- jar file from where the tasks are loaded -->
26 <path id="android.antlibs"> 26 <path id="android.antlibs">
27 <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> 27 <pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
28 </path> 28 </path>
29 29
30 <!-- Custom tasks --> 30 <!-- Custom tasks -->
31 <taskdef resource="anttasks.properties" classpathref="android.antlibs" /> 31 <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
32 32
33 <condition property="build.target" value="release" else="debug"> 33 <condition property="build.target" value="release" else="debug">
34 <equals arg1="${CONFIGURATION_NAME}" arg2="Release" /> 34 <equals arg1="${CONFIGURATION_NAME}" arg2="Release" />
35 </condition> 35 </condition>
36 <condition property="build.is.packaging.debug" value="true" else="false"> 36 <condition property="build.is.packaging.debug" value="true" else="false">
37 <equals arg1="${build.target}" arg2="debug" /> 37 <equals arg1="${build.target}" arg2="debug" />
(...skipping 27 matching lines...) Expand all
65 verbose="${verbose}" 65 verbose="${verbose}"
66 hascode="true" 66 hascode="true"
67 previousBuildType="/" 67 previousBuildType="/"
68 buildType="${build.is.packaging.debug}/${build.is.signing.debug}"> 68 buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
69 <dex path="${intermediate.dex.file}"/> 69 <dex path="${intermediate.dex.file}"/>
70 <sourcefolder path="${source.absolute.dir}"/> 70 <sourcefolder path="${source.absolute.dir}"/>
71 <nativefolder path="${native.libs.absolute.dir}" /> 71 <nativefolder path="${native.libs.absolute.dir}" />
72 </apkbuilder> 72 </apkbuilder>
73 </target> 73 </target>
74 </project> 74 </project>
OLDNEW
« no previous file with comments | « build/android/ant/apk-obfuscate.xml ('k') | build/android/ant/apk-package-resources.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698