content/shell/android/javatests/content_shell_test_apk.xml - Issue 10830287: Adding AndroidProxySelectorTest to ContentShell

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/shell/android/javatests/content_shell_test_apk.xml

Issue 10830287: Adding AndroidProxySelectorTest to ContentShell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing Chris' nit Created 8 years, 4 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

« content/content_tests.gypi ('K') | « content/content_tests.gypi ('k') | net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java » ('j') | net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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="ContentShellTest" default="debug" basedir=".">	7 <project name="ContentShellTest" default="debug" basedir=".">

8	8

9 <description>	9 <description>

10 Building ContentShellTest.apk	10 Building ContentShellTest.apk

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 </then>	57 </then>

58 </if>	58 </if>

59	59

60 <!-- We also want a .jar as well as an .apk for ContentShellTest-debug	60 <!-- We also want a .jar as well as an .apk for ContentShellTest-debug

61 so that proguard can be used to list the tests by annotation. -->	61 so that proguard can be used to list the tests by annotation. -->

62 <jar destfile="${out.dir}/${ant.project.name}-debug.jar">	62 <jar destfile="${out.dir}/${ant.project.name}-debug.jar">

63 <fileset dir="${out.dir}/classes" includes="*/.class"/>	63 <fileset dir="${out.dir}/classes" includes="*/.class"/>

64 <zipfileset	64 <zipfileset

65 includes="*/.class"	65 includes="*/.class"

66 src="${PRODUCT_DIR}/content_shell_test/java/libs/chromium_content_javat ests.jar"/>	66 src="${PRODUCT_DIR}/content_shell_test/java/libs/chromium_content_javat ests.jar"/>

	67 <zipfileset

	68 includes="*/.class"

	69 src="${PRODUCT_DIR}/content_shell_test/java/libs/chromium_net_javatests .jar"/>

67 </jar>	70 </jar>

68	71

69 </target>	72 </target>

70	73

71 <!-- Classpath for javac -->	74 <!-- Classpath for javac -->

72 <path id="javac.custom.classpath">	75 <path id="javac.custom.classpath">

73 <path refid="out.dex.jar.input.ref"/>	76 <path refid="out.dex.jar.input.ref"/>

74 </path>	77 </path>

75 <import file="${sdk.dir}/tools/ant/build.xml" />	78 <import file="${sdk.dir}/tools/ant/build.xml" />

76	79

77 </project>	80 </project>

OLD	NEW