OLD | NEW |
---|---|
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 Loading... | |
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 'includes': [ '../build/java.gypi' ], | |
cjhopman
2012/08/13 21:09:53
Nit: Move the 'includes' to the end below 'depende
aurimas (slooooooooow)
2012/08/13 22:40:28
Done.
| |
1996 'dependencies': [ | |
1997 '../base/base.gyp:base_java', | |
1998 '../base/base.gyp:base_java_test_support', | |
1999 ], | |
Yaron
2012/08/13 20:46:03
Does this need to export_dependent_settings?
aurimas (slooooooooow)
2012/08/13 22:40:28
Done.
| |
2000 }, | |
1988 ], | 2001 ], |
1989 }], | 2002 }], |
1990 # Special target to wrap a gtest_target_type==shared_library | 2003 # Special target to wrap a gtest_target_type==shared_library |
1991 # net_unittests into an android apk for execution. | 2004 # net_unittests into an android apk for execution. |
1992 # See base.gyp for TODO(jrg)s about this strategy. | 2005 # See base.gyp for TODO(jrg)s about this strategy. |
1993 ['OS == "android" and gtest_target_type == "shared_library"', { | 2006 ['OS == "android" and gtest_target_type == "shared_library"', { |
1994 'targets': [ | 2007 'targets': [ |
1995 { | 2008 { |
1996 'target_name': 'net_unittests_apk', | 2009 'target_name': 'net_unittests_apk', |
1997 'type': 'none', | 2010 'type': 'none', |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2063 '--result', '<@(_outputs)', | 2076 '--result', '<@(_outputs)', |
2064 '--isolate', 'net_unittests.isolate', | 2077 '--isolate', 'net_unittests.isolate', |
2065 ], | 2078 ], |
2066 }, | 2079 }, |
2067 ], | 2080 ], |
2068 }, | 2081 }, |
2069 ], | 2082 ], |
2070 }], | 2083 }], |
2071 ], | 2084 ], |
2072 } | 2085 } |
OLD | NEW |