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

Side by Side Diff: testing/android/native_test_apk.xml

Issue 10694128: Fix the conflict of input and output manifest files (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 5 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 | « no previous file | 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 7
8 <project name="replaceme" default="debug" basedir="."> 8 <project name="replaceme" default="debug" basedir=".">
9 9
10 <description> 10 <description>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 <fileset dir="${external.jars.dir}" includes="*.jar"/> 59 <fileset dir="${external.jars.dir}" includes="*.jar"/>
60 </path> 60 </path>
61 <condition property="java.compilerargs" 61 <condition property="java.compilerargs"
62 value="-classpath ${toString:out.dex.jar.input.ref}"> 62 value="-classpath ${toString:out.dex.jar.input.ref}">
63 <not> 63 <not>
64 <equals arg1="${external.jars.dir}" arg2=""/> 64 <equals arg1="${external.jars.dir}" arg2=""/>
65 </not> 65 </not>
66 </condition> 66 </condition>
67 <property name="native.libs.absolute.dir" location="${out.dir}/libs" /> 67 <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
68 68
69 <copy file="${out.dir}/AndroidManifest.xml" todir="${out.dir}/manifest"/>
nilesh 2012/07/11 05:58:31 Please add a comment here.
70 <property name="manifest.abs.file" location="${out.dir}/manifest/AndroidManife st.xml"/>
71
69 <target name="-post-compile"> 72 <target name="-post-compile">
70 <!-- copy gdbserver to main libs directory if building debug. --> 73 <!-- copy gdbserver to main libs directory if building debug. -->
71 <if> 74 <if>
72 <condition> 75 <condition>
73 <equals arg1="${build.target}" arg2="debug" /> 76 <equals arg1="${build.target}" arg2="debug" />
74 </condition> 77 </condition>
75 <then> 78 <then>
76 <echo message="Copying gdbserver to the apk to enable native debugging"/ > 79 <echo message="Copying gdbserver to the apk to enable native debugging"/ >
77 <copy todir="${out.dir}/libs/${target.abi}"> 80 <copy todir="${out.dir}/libs/${target.abi}">
78 <path refid="native.libs.gdbserver"/> 81 <path refid="native.libs.gdbserver"/>
79 </copy> 82 </copy>
80 </then> 83 </then>
81 </if> 84 </if>
82 </target> 85 </target>
83 86
84 <import file="${sdk.dir}/tools/ant/build.xml" /> 87 <import file="${sdk.dir}/tools/ant/build.xml" />
85 88
86 </project> 89 </project>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698