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

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

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 7 years, 10 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 | « base/base.gyp ('k') | build/android/ant/chromium-jars.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 <!-- 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.
11 --> 11 -->
12 <target name="Debug" depends="debug"/> 12 <target name="Debug" depends="debug"/>
13 <target name="Release" depends="release"/> 13 <target name="Release" depends="release"/>
14 <target name="error"> 14 <target name="error">
15 <fail message="CONFIGURATION_NAME should be passed as a target to ant."/> 15 <fail message="CONFIGURATION_NAME should be passed as a target to ant."/>
16 </target> 16 </target>
17 17
18 <description> 18 <description>
19 Building ${ant.project.name}.apk 19 Building ${ant.project.name}.apk
20 </description> 20 </description>
21 <import file="common.xml"/> 21 <import file="common.xml"/>
22 22
23 <property-location 23 <property-location name="out.dir" location="${OUT_DIR}" check-exists="false" / >
24 name="out.dir"
25 location="${PRODUCT_DIR}/${PACKAGE_NAME}"
26 check-exists="false"
27 />
28 24
29 <path id="javac.srcdirs.additional"> 25 <path id="javac.srcdirs.additional">
30 <filelist files="${ADDITIONAL_SRC_DIRS}"/> 26 <filelist files="${ADDITIONAL_SRC_DIRS}"/>
31 <filelist files="${GENERATED_SRC_DIRS}"/> 27 <filelist files="${GENERATED_SRC_DIRS}"/>
32 </path> 28 </path>
33 29
34 <!-- 30 <!--
35 Include additional resource folders in the apk, e.g. content/.../res. We 31 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 32 list the res folders in project.library.res.folder.path and the
37 corresponding java packages in project.library.packages, which must be 33 corresponding java packages in project.library.packages, which must be
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 </path> 81 </path>
86 82
87 <path id="out.dex.jar.input.ref"> 83 <path id="out.dex.jar.input.ref">
88 <path refid="javac.custom.classpath"/> 84 <path refid="javac.custom.classpath"/>
89 </path> 85 </path>
90 86
91 <import file="sdk-targets.xml"/> 87 <import file="sdk-targets.xml"/>
92 <import file="${sdk.dir}/tools/ant/build.xml"/> 88 <import file="${sdk.dir}/tools/ant/build.xml"/>
93 </project> 89 </project>
94 90
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | build/android/ant/chromium-jars.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698