| Index: net/net.gyp
|
| diff --git a/net/net.gyp b/net/net.gyp
|
| index f8de4ffc7297fc4c6466973ade3a7fb19111cd53..8c34a60c3e61123a164984af5c6f3181c92ddf74 100644
|
| --- a/net/net.gyp
|
| +++ b/net/net.gyp
|
| @@ -1740,45 +1740,6 @@
|
| },
|
| ],
|
| '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': [
|
| {
|
| @@ -1981,5 +1942,41 @@
|
| },
|
| ],
|
| }],
|
| + ['test_isolation_mode != "noop"', {
|
| + 'targets': [
|
| + {
|
| + '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',
|
| + ],
|
| + },
|
| + ],
|
| + },
|
| + ],
|
| + }],
|
| ],
|
| }
|
|
|