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

Side by Side Diff: content/shell/android/content_shell_apk.xml

Issue 10388067: Fix the content_shell.apk in android x86 target build bug (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix the content_shell.apk in android x86 target build bug Created 8 years, 7 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 | « content/content_shell.gypi ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 3 Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 <project name="ContentShell" default="debug" basedir="."> 7 <project name="ContentShell" default="debug" basedir=".">
8 8
9 <description> 9 <description>
10 Building ContentShell.apk 10 Building ContentShell.apk
11 </description> 11 </description>
12 12
13 <property environment="env"/> 13 <property environment="env"/>
14 <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/> 14 <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
15 <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/> 15 <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/>
16 <property name="source.dir" location="java"/> 16 <property name="source.dir" location="java"/>
17 <property name="target" value="android-14"/> 17 <property name="target" value="android-14"/>
18 <property name="target.abi" value="${APP_ABI}"/>
18 <property name="out.dir" location="${PRODUCT_DIR}/content_shell"/> 19 <property name="out.dir" location="${PRODUCT_DIR}/content_shell"/>
19 <property name="resource.absolute.dir" value="res"/> 20 <property name="resource.absolute.dir" value="res"/>
20 <property name="gen.absolute.dir" value="${out.dir}/gen"/> 21 <property name="gen.absolute.dir" value="${out.dir}/gen"/>
21 <property name="jar.libs.dir" value="${out.dir}/java/libs"/> 22 <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
22 <path id="native.libs.gdbserver"> 23 <path id="native.libs.gdbserver">
23 <fileset file="${toolchain.dir}/../../gdbserver"/> 24 <fileset file="${toolchain.dir}/../../gdbserver"/>
24 </path> 25 </path>
25 <property name="native.libs.absolute.dir" location="${out.dir}/libs" /> 26 <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
26 <!-- If your app crashes when referencing java from a different .jar 27 <!-- If your app crashes when referencing java from a different .jar
27 (e.g. java.lang.NoClassDefFoundError: 28 (e.g. java.lang.NoClassDefFoundError:
(...skipping 23 matching lines...) Expand all
51 TODO(jrg): for now, Chrome on Android always builds native code 52 TODO(jrg): for now, Chrome on Android always builds native code
52 as Release and java/ant as Debug, which means we always install 53 as Release and java/ant as Debug, which means we always install
53 gdbserver. Resolve this discrepancy, possibly by making this 54 gdbserver. Resolve this discrepancy, possibly by making this
54 Release Official build java/ant as Release. --> 55 Release Official build java/ant as Release. -->
55 <if> 56 <if>
56 <condition> 57 <condition>
57 <equals arg1="${build.target}" arg2="debug" /> 58 <equals arg1="${build.target}" arg2="debug" />
58 </condition> 59 </condition>
59 <then> 60 <then>
60 <echo message="Copying gdbserver to the apk to enable native debugging"/ > 61 <echo message="Copying gdbserver to the apk to enable native debugging"/ >
61 <copy todir="${out.dir}/libs/armeabi"> 62 <copy todir="${out.dir}/libs/${target.abi}">
62 <path refid="native.libs.gdbserver"/> 63 <path refid="native.libs.gdbserver"/>
63 </copy> 64 </copy>
64 </then> 65 </then>
65 </if> 66 </if>
66 </target> 67 </target>
67 68
68 <import file="${sdk.dir}/tools/ant/build.xml" /> 69 <import file="${sdk.dir}/tools/ant/build.xml" />
69 70
70 </project> 71 </project>
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698