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

Side by Side Diff: build/android/ant/apk-compile.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-codegen.xml ('k') | build/android/ant/apk-obfuscate.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
(...skipping 21 matching lines...) Expand all
32 <property name="android.platform.tools.dir" location="${sdk.dir}/platform-tool s" /> 32 <property name="android.platform.tools.dir" location="${sdk.dir}/platform-tool s" />
33 33
34 <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" /> 34 <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" />
35 <path id="project.target.class.path"> 35 <path id="project.target.class.path">
36 <pathelement location="${project.target.android.jar}" /> 36 <pathelement location="${project.target.android.jar}" />
37 </path> 37 </path>
38 38
39 39
40 <!-- jar file from where the tasks are loaded --> 40 <!-- jar file from where the tasks are loaded -->
41 <path id="android.antlibs"> 41 <path id="android.antlibs">
42 <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> 42 <pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
43 </path> 43 </path>
44 44
45 <!-- Custom tasks --> 45 <!-- Custom tasks -->
46 <taskdef resource="anttasks.properties" classpathref="android.antlibs" /> 46 <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
47 47
48 48
49 <path id="javac.srcdirs.additional"> 49 <path id="javac.srcdirs.additional">
50 <filelist files="${ADDITIONAL_SRC_DIRS}"/> 50 <filelist files="${ADDITIONAL_SRC_DIRS}"/>
51 <filelist files="${GENERATED_SRC_DIRS}"/> 51 <filelist files="${GENERATED_SRC_DIRS}"/>
52 </path> 52 </path>
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 dexedlibs="${out.dexed.absolute.dir}" 238 dexedlibs="${out.dexed.absolute.dir}"
239 nolocals="false" 239 nolocals="false"
240 forceJumbo="${dex.force.jumbo}" 240 forceJumbo="${dex.force.jumbo}"
241 verbose="${verbose}"> 241 verbose="${verbose}">
242 <path path="${out.dex.input.absolute.dir}"/> 242 <path path="${out.dex.input.absolute.dir}"/>
243 <path refid="out.dex.jar.input.ref" /> 243 <path refid="out.dex.jar.input.ref" />
244 </dex> 244 </dex>
245 <touch file="${STAMP}" /> 245 <touch file="${STAMP}" />
246 </target> 246 </target>
247 </project> 247 </project>
OLDNEW
« no previous file with comments | « build/android/ant/apk-codegen.xml ('k') | build/android/ant/apk-obfuscate.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698