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

Unified Diff: net/net.gyp

Issue 10698126: Move net_unittests and net_unittests_run inside a inside_chromium_build==1 condition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tyop Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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': [
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698