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

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

Issue 11783108: Revert 176176 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « android_webview/javatests/AndroidManifest.xml ('k') | build/android/ant/create-test-jar.js » ('j') | no next file with comments »
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 23 matching lines...) Expand all
34 <!-- 34 <!--
35 Include additional resource folders in the apk, e.g. content/.../res. We 35 Include additional resource folders in the apk, e.g. content/.../res. We
36 list the res folders in project.library.res.folder.path and the 36 list the res folders in project.library.res.folder.path and the
37 corresponding java packages in project.library.packages, which must be 37 corresponding java packages in project.library.packages, which must be
38 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence 38 semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence
39 the javascript task. 39 the javascript task.
40 --> 40 -->
41 <path id="project.library.res.folder.path"> 41 <path id="project.library.res.folder.path">
42 <filelist files="${ADDITIONAL_RES_DIRS}"/> 42 <filelist files="${ADDITIONAL_RES_DIRS}"/>
43 </path> 43 </path>
44 <path id="project.library.bin.r.file.path">
45 <filelist files="${ADDITIONAL_R_TEXT_FILES}"/>
46 </path>
47 <script language="javascript"> 44 <script language="javascript">
48 var before = project.getProperty("ADDITIONAL_RES_PACKAGES"); 45 var before = project.getProperty("ADDITIONAL_RES_PACKAGES");
49 project.setProperty("project.library.packages", before.replaceAll(" ", ";")) ; 46 project.setProperty("project.library.packages", before.replaceAll(" ", ";")) ;
50 </script> 47 </script>
51 48
52 <property-value name="target.abi" value="${APP_ABI}"/> 49 <property-value name="target.abi" value="${APP_ABI}"/>
53 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/> 50 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
54 <property-value name="gen.absolute.dir" value="${out.dir}/gen"/> 51 <property-value name="gen.absolute.dir" value="${out.dir}/gen"/>
55 <property-location name="native.libs.absolute.dir" location="${out.dir}/libs" 52 <property-location name="native.libs.absolute.dir" location="${out.dir}/libs"
56 check-exists="false"/> 53 check-exists="false"/>
(...skipping 28 matching lines...) Expand all
85 </path> 82 </path>
86 83
87 <path id="out.dex.jar.input.ref"> 84 <path id="out.dex.jar.input.ref">
88 <path refid="javac.custom.classpath"/> 85 <path refid="javac.custom.classpath"/>
89 </path> 86 </path>
90 87
91 <import file="sdk-targets.xml"/> 88 <import file="sdk-targets.xml"/>
92 <import file="${sdk.dir}/tools/ant/build.xml"/> 89 <import file="${sdk.dir}/tools/ant/build.xml"/>
93 </project> 90 </project>
94 91
OLDNEW
« no previous file with comments | « android_webview/javatests/AndroidManifest.xml ('k') | build/android/ant/create-test-jar.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698