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

Side by Side Diff: net/net.gyp

Issue 10830287: Adding AndroidProxySelectorTest to ContentShell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing piman's 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
« no previous file with comments | « net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java ('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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1970 matching lines...) Expand 10 before | Expand all | Expand 10 after
1981 'java_in_dir': '../net/android/java', 1981 'java_in_dir': '../net/android/java',
1982 }, 1982 },
1983 'dependencies': [ 1983 'dependencies': [
1984 '../base/base.gyp:base_java', 1984 '../base/base.gyp:base_java',
1985 ], 1985 ],
1986 'export_dependent_settings': [ 1986 'export_dependent_settings': [
1987 '../base/base.gyp:base_java', 1987 '../base/base.gyp:base_java',
1988 ], 1988 ],
1989 'includes': [ '../build/java.gypi' ], 1989 'includes': [ '../build/java.gypi' ],
1990 }, 1990 },
1991 {
1992 'target_name': 'net_javatests',
1993 'type': 'none',
1994 'variables': {
1995 'package_name': 'net_javatests',
1996 'java_in_dir': '../net/android/javatests',
1997 },
1998 'dependencies': [
1999 '../base/base.gyp:base_java',
2000 '../base/base.gyp:base_java_test_support',
2001 ],
2002 'export_dependent_settings': [
2003 '../base/base.gyp:base_java',
2004 '../base/base.gyp:base_java_test_support',
2005 ],
2006 'includes': [ '../build/java.gypi' ],
2007 },
1991 ], 2008 ],
1992 }], 2009 }],
1993 # Special target to wrap a gtest_target_type==shared_library 2010 # Special target to wrap a gtest_target_type==shared_library
1994 # net_unittests into an android apk for execution. 2011 # net_unittests into an android apk for execution.
1995 # See base.gyp for TODO(jrg)s about this strategy. 2012 # See base.gyp for TODO(jrg)s about this strategy.
1996 ['OS == "android" and gtest_target_type == "shared_library"', { 2013 ['OS == "android" and gtest_target_type == "shared_library"', {
1997 'targets': [ 2014 'targets': [
1998 { 2015 {
1999 'target_name': 'net_unittests_apk', 2016 'target_name': 'net_unittests_apk',
2000 'type': 'none', 2017 'type': 'none',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
2066 '--result', '<@(_outputs)', 2083 '--result', '<@(_outputs)',
2067 '--isolate', 'net_unittests.isolate', 2084 '--isolate', 'net_unittests.isolate',
2068 ], 2085 ],
2069 }, 2086 },
2070 ], 2087 ],
2071 }, 2088 },
2072 ], 2089 ],
2073 }], 2090 }],
2074 ], 2091 ],
2075 } 2092 }
OLDNEW
« no previous file with comments | « net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698