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

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 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
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 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1978 'java_in_dir': '../net/android/java', 1978 'java_in_dir': '../net/android/java',
1979 }, 1979 },
1980 'dependencies': [ 1980 'dependencies': [
1981 '../base/base.gyp:base_java', 1981 '../base/base.gyp:base_java',
1982 ], 1982 ],
1983 'export_dependent_settings': [ 1983 'export_dependent_settings': [
1984 '../base/base.gyp:base_java', 1984 '../base/base.gyp:base_java',
1985 ], 1985 ],
1986 'includes': [ '../build/java.gypi' ], 1986 'includes': [ '../build/java.gypi' ],
1987 }, 1987 },
1988 {
1989 'target_name': 'net_javatests',
1990 'type': 'none',
1991 'variables': {
1992 'package_name': 'net_javatests',
1993 'java_in_dir': '../net/android/javatests',
1994 },
1995 'dependencies': [
1996 '../base/base.gyp:base_java',
1997 '../base/base.gyp:base_java_test_support',
1998 ],
1999 'export_dependent_settings': [
2000 '../base/base.gyp:base_java',
2001 '../base/base.gyp:base_java_test_support',
aurimas (slooooooooow) 2012/08/13 22:40:28 Chris, is this what you meant for me to do?
cjhopman 2012/08/13 22:42:47 Looks good.
2002 ],
2003 'includes': [ '../build/java.gypi' ],
2004 },
1988 ], 2005 ],
1989 }], 2006 }],
1990 # Special target to wrap a gtest_target_type==shared_library 2007 # Special target to wrap a gtest_target_type==shared_library
1991 # net_unittests into an android apk for execution. 2008 # net_unittests into an android apk for execution.
1992 # See base.gyp for TODO(jrg)s about this strategy. 2009 # See base.gyp for TODO(jrg)s about this strategy.
1993 ['OS == "android" and gtest_target_type == "shared_library"', { 2010 ['OS == "android" and gtest_target_type == "shared_library"', {
1994 'targets': [ 2011 'targets': [
1995 { 2012 {
1996 'target_name': 'net_unittests_apk', 2013 'target_name': 'net_unittests_apk',
1997 'type': 'none', 2014 'type': 'none',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
2063 '--result', '<@(_outputs)', 2080 '--result', '<@(_outputs)',
2064 '--isolate', 'net_unittests.isolate', 2081 '--isolate', 'net_unittests.isolate',
2065 ], 2082 ],
2066 }, 2083 },
2067 ], 2084 ],
2068 }, 2085 },
2069 ], 2086 ],
2070 }], 2087 }],
2071 ], 2088 ],
2072 } 2089 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698