Index: net/net.gyp |
diff --git a/net/net.gyp b/net/net.gyp |
index 73c7fd4168711eab24eab04bf2408701b3c92152..48fd6b3b69b71ec5f23ff56ff413a70df9fa7bae 100644 |
--- a/net/net.gyp |
+++ b/net/net.gyp |
@@ -1287,8 +1287,8 @@ |
'conditions': [ |
['chromeos==1', { |
'sources!': [ |
- 'base/network_change_notifier_linux_unittest.cc', |
- 'proxy/proxy_config_service_linux_unittest.cc', |
+ 'base/network_change_notifier_linux_unittest.cc', |
+ 'proxy/proxy_config_service_linux_unittest.cc', |
], |
}], |
[ 'use_glib == 1', { |
@@ -1395,38 +1395,6 @@ |
], |
}, |
{ |
- 'target_name': 'net_unittests_run', |
- 'type': 'none', |
- 'dependencies': [ |
- 'net_unittests', |
- ], |
- 'includes': [ |
- 'net_unittests.isolate', |
- ], |
- 'actions': [ |
- { |
- 'action_name': 'isolate', |
- 'inputs': [ |
- 'net_unittests.isolate', |
- '<@(isolate_dependency_tracked)', |
- ], |
- 'outputs': [ |
- '<(PRODUCT_DIR)/net_unittests.results', |
- ], |
- 'action': [ |
- 'python', |
- '../tools/isolate/isolate.py', |
- '<(test_isolation_mode)', |
- '--outdir', '<(test_isolation_outdir)', |
- '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', |
- '--variable', 'OS', '<(OS)', |
- '--result', '<@(_outputs)', |
- '--isolate', 'net_unittests.isolate', |
- ], |
- }, |
- ], |
- }, |
- { |
'target_name': 'net_perftests', |
'type': 'executable', |
'dependencies': [ |
@@ -1746,6 +1714,45 @@ |
}, |
], |
'conditions': [ |
+ ['inside_chromium_build==1', { |
+ 'targets': [ |
+ # This target depends on dependencies not fetched by WebKit's DEPS. |
+ # In particular, ..\chrome\test\data and ..\third_party\python_26 on |
+ # Windows. |
+ { |
+ 'target_name': 'net_unittests_run', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'net_unittests', |
+ ], |
+ 'includes': [ |
+ 'net_unittests.isolate', |
+ ], |
+ 'actions': [ |
+ { |
+ 'action_name': 'isolate', |
+ 'inputs': [ |
+ 'net_unittests.isolate', |
+ '<@(isolate_dependency_tracked)', |
+ ], |
+ 'outputs': [ |
+ '<(PRODUCT_DIR)/net_unittests.results', |
+ ], |
+ 'action': [ |
+ 'python', |
+ '../tools/isolate/isolate.py', |
+ '<(test_isolation_mode)', |
+ '--outdir', '<(test_isolation_outdir)', |
+ '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)', |
+ '--variable', 'OS', '<(OS)', |
+ '--result', '<@(_outputs)', |
+ '--isolate', 'net_unittests.isolate', |
+ ], |
+ }, |
+ ], |
+ }, |
+ ], |
+ }], |
['os_posix == 1 and OS != "mac" and OS != "android"', { |
'targets': [ |
{ |