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

Side by Side Diff: build/android/ant/apk-codegen.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 | « DEPS ('k') | build/android/ant/apk-compile.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="-code-gen"> 18 <project default="-code-gen">
19 <property name="verbose" value="false" /> 19 <property name="verbose" value="false" />
20 20
21 <property name="out.dir" location="${OUT_DIR}" /> 21 <property name="out.dir" location="${OUT_DIR}" />
22 <property name="out.absolute.dir" location="${out.dir}" /> 22 <property name="out.absolute.dir" location="${out.dir}" />
23 <property name="out.res.absolute.dir" location="${out.dir}/res" /> 23 <property name="out.res.absolute.dir" location="${out.dir}/res" />
24 <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xm l" /> 24 <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xm l" />
25 <property name="gen.absolute.dir" value="${out.dir}/gen"/> 25 <property name="gen.absolute.dir" value="${out.dir}/gen"/>
26 26
27 <!-- tools location --> 27 <!-- tools location -->
28 <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/> 28 <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
29 <property name="target" value="android-${ANDROID_SDK_VERSION}"/> 29 <property name="android.sdk.tools.dir" location="${ANDROID_SDK_TOOLS}" />
30 <property name="android.tools.dir" location="${sdk.dir}/tools" /> 30 <property name="aapt" location="${android.sdk.tools.dir}/aapt" />
31 <property name="android.platform.tools.dir" location="${sdk.dir}/platform-tool s" />
32 <property name="aapt" location="${android.platform.tools.dir}/aapt" />
33 <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" /> 31 <property name="project.target.android.jar" location="${ANDROID_SDK_JAR}" />
34 32
35 <!-- jar file from where the tasks are loaded --> 33 <!-- jar file from where the tasks are loaded -->
36 <path id="android.antlibs"> 34 <path id="android.antlibs">
37 <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> 35 <pathelement path="${sdk.dir}/tools/lib/ant-tasks.jar" />
38 </path> 36 </path>
39 37
40 <!-- Custom tasks --> 38 <!-- Custom tasks -->
41 <taskdef resource="anttasks.properties" classpathref="android.antlibs" /> 39 <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
42 40
43 <!-- 41 <!--
44 Include additional resource folders in the apk, e.g. content/.../res. We 42 Include additional resource folders in the apk, e.g. content/.../res. We
45 list the res folders in project.library.res.folder.path and the 43 list the res folders in project.library.res.folder.path and the
46 corresponding java packages in project.library.packages, which must be 44 corresponding java packages in project.library.packages, which must be
47 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence 45 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 ignoreAssets="${aapt.ignore.assets}" 105 ignoreAssets="${aapt.ignore.assets}"
108 binFolder="${out.absolute.dir}" 106 binFolder="${out.absolute.dir}"
109 proguardFile="${out.absolute.dir}/proguard.txt"> 107 proguardFile="${out.absolute.dir}/proguard.txt">
110 <res path="${out.res.absolute.dir}" /> 108 <res path="${out.res.absolute.dir}" />
111 <res path="${resource.absolute.dir}" /> 109 <res path="${resource.absolute.dir}" />
112 </aapt> 110 </aapt>
113 111
114 <touch file="${STAMP}" /> 112 <touch file="${STAMP}" />
115 </target> 113 </target>
116 </project> 114 </project>
OLDNEW
« no previous file with comments | « DEPS ('k') | build/android/ant/apk-compile.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698