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

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

Issue 11363150: Support Java resources within content and chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | build/android/ant/chromium-jars.xml » ('j') | build/java.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!-- 1 <!--
2 Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. 4 found in the LICENSE file.
5 --> 5 -->
6 <project default="error"> 6 <project default="error">
7 <property name="ant.project.name" value="${APK_NAME}"/> 7 <property name="ant.project.name" value="${APK_NAME}"/>
8 <!-- 8 <!--
9 Gyp will pass CONFIGURATION_NAME as the target for ant to build. These targe ts will call the 9 Gyp will pass CONFIGURATION_NAME as the target for ant to build. These targe ts will call the
10 appropriate sdk tools target. 10 appropriate sdk tools target.
(...skipping 13 matching lines...) Expand all
24 name="out.dir" 24 name="out.dir"
25 location="${PRODUCT_DIR}/${PACKAGE_NAME}" 25 location="${PRODUCT_DIR}/${PACKAGE_NAME}"
26 check-exists="false" 26 check-exists="false"
27 /> 27 />
28 28
29 <path id="javac.srcdirs.additional"> 29 <path id="javac.srcdirs.additional">
30 <filelist files="${ADDITIONAL_SRC_DIRS}"/> 30 <filelist files="${ADDITIONAL_SRC_DIRS}"/>
31 <filelist files="${GENERATED_SRC_DIRS}"/> 31 <filelist files="${GENERATED_SRC_DIRS}"/>
32 </path> 32 </path>
33 33
34 <!-- Include additional resource folders in the apk, e.g. content/.../res.
35 We list the res folders in project.library.res.folder.path and the
36 corresponding java packages in project.library.packages, which must be
37 semicolon-delimited while ADDITION_RES_PACKAGES is space-delimited, hence
cjhopman 2012/11/09 22:21:30 ADDITION_RES_PACKAGES is misspelled.
newt (away) 2012/11/09 23:05:35 Done.
38 the javascript task. -->
cjhopman 2012/11/09 22:21:30 Nit: Use multi-line comment formatting like on lin
newt (away) 2012/11/09 23:05:35 Done.
39 <path id="project.library.res.folder.path">
40 <filelist files="${ADDITIONAL_RES_DIRS}"/>
41 </path>
42 <script language="javascript">
43 var before = project.getProperty("ADDITIONAL_RES_PACKAGES");
cjhopman 2012/11/09 22:21:30 Nit: indent 2, not 4
newt (away) 2012/11/09 23:05:35 Done.
44 project.setProperty("project.library.packages", before.replaceAll(" ", ";" ));
45 </script>
46
34 <property-value name="target.abi" value="${APP_ABI}"/> 47 <property-value name="target.abi" value="${APP_ABI}"/>
35 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/> 48 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
36 <property-value name="gen.absolute.dir" value="${out.dir}/gen"/> 49 <property-value name="gen.absolute.dir" value="${out.dir}/gen"/>
37 <property-location name="native.libs.absolute.dir" location="${out.dir}/libs" 50 <property-location name="native.libs.absolute.dir" location="${out.dir}/libs"
38 check-exists="false"/> 51 check-exists="false"/>
39 52
40 <property-value name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/> 53 <property-value name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/>
41 <property-value name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/> 54 <property-value name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/>
42 55
43 <!-- 56 <!--
(...skipping 23 matching lines...) Expand all
67 </path> 80 </path>
68 81
69 <path id="out.dex.jar.input.ref"> 82 <path id="out.dex.jar.input.ref">
70 <path refid="javac.custom.classpath"/> 83 <path refid="javac.custom.classpath"/>
71 </path> 84 </path>
72 85
73 <import file="sdk-targets.xml"/> 86 <import file="sdk-targets.xml"/>
74 <import file="${sdk.dir}/tools/ant/build.xml"/> 87 <import file="${sdk.dir}/tools/ant/build.xml"/>
75 </project> 88 </project>
76 89
OLDNEW
« no previous file with comments | « no previous file | build/android/ant/chromium-jars.xml » ('j') | build/java.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698