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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 'websockets/websocket_frame_unittest.cc', 1280 'websockets/websocket_frame_unittest.cc',
1281 'websockets/websocket_handshake_handler_unittest.cc', 1281 'websockets/websocket_handshake_handler_unittest.cc',
1282 'websockets/websocket_job_spdy2_unittest.cc', 1282 'websockets/websocket_job_spdy2_unittest.cc',
1283 'websockets/websocket_job_spdy3_unittest.cc', 1283 'websockets/websocket_job_spdy3_unittest.cc',
1284 'websockets/websocket_net_log_params_unittest.cc', 1284 'websockets/websocket_net_log_params_unittest.cc',
1285 'websockets/websocket_throttle_unittest.cc', 1285 'websockets/websocket_throttle_unittest.cc',
1286 ], 1286 ],
1287 'conditions': [ 1287 'conditions': [
1288 ['chromeos==1', { 1288 ['chromeos==1', {
1289 'sources!': [ 1289 'sources!': [
1290 'base/network_change_notifier_linux_unittest.cc', 1290 'base/network_change_notifier_linux_unittest.cc',
1291 'proxy/proxy_config_service_linux_unittest.cc', 1291 'proxy/proxy_config_service_linux_unittest.cc',
1292 ], 1292 ],
1293 }], 1293 }],
1294 [ 'use_glib == 1', { 1294 [ 'use_glib == 1', {
1295 'dependencies': [ 1295 'dependencies': [
1296 '../build/linux/system.gyp:ssl', 1296 '../build/linux/system.gyp:ssl',
1297 ], 1297 ],
1298 }, { # else: OS is not in the above list 1298 }, { # else: OS is not in the above list
1299 'sources!': [ 1299 'sources!': [
1300 'base/cert_database_nss_unittest.cc', 1300 'base/cert_database_nss_unittest.cc',
1301 ], 1301 ],
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 ] 1388 ]
1389 }], 1389 }],
1390 [ 'OS != "win" and OS != "mac"', { 1390 [ 'OS != "win" and OS != "mac"', {
1391 'sources!': [ 1391 'sources!': [
1392 'base/x509_cert_types_unittest.cc', 1392 'base/x509_cert_types_unittest.cc',
1393 ], 1393 ],
1394 }] 1394 }]
1395 ], 1395 ],
1396 }, 1396 },
1397 { 1397 {
1398 'target_name': 'net_unittests_run',
1399 'type': 'none',
1400 'dependencies': [
1401 'net_unittests',
1402 ],
1403 'includes': [
1404 'net_unittests.isolate',
1405 ],
1406 'actions': [
1407 {
1408 'action_name': 'isolate',
1409 'inputs': [
1410 'net_unittests.isolate',
1411 '<@(isolate_dependency_tracked)',
1412 ],
1413 'outputs': [
1414 '<(PRODUCT_DIR)/net_unittests.results',
1415 ],
1416 'action': [
1417 'python',
1418 '../tools/isolate/isolate.py',
1419 '<(test_isolation_mode)',
1420 '--outdir', '<(test_isolation_outdir)',
1421 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
1422 '--variable', 'OS', '<(OS)',
1423 '--result', '<@(_outputs)',
1424 '--isolate', 'net_unittests.isolate',
1425 ],
1426 },
1427 ],
1428 },
1429 {
1430 'target_name': 'net_perftests', 1398 'target_name': 'net_perftests',
1431 'type': 'executable', 1399 'type': 'executable',
1432 'dependencies': [ 1400 'dependencies': [
1433 'net', 1401 'net',
1434 'net_test_support', 1402 'net_test_support',
1435 '../base/base.gyp:base', 1403 '../base/base.gyp:base',
1436 '../base/base.gyp:base_i18n', 1404 '../base/base.gyp:base_i18n',
1437 '../base/base.gyp:test_support_perf', 1405 '../base/base.gyp:test_support_perf',
1438 '../build/temp_gyp/googleurl.gyp:googleurl', 1406 '../build/temp_gyp/googleurl.gyp:googleurl',
1439 '../testing/gtest.gyp:gtest', 1407 '../testing/gtest.gyp:gtest',
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1739 'dependencies': [ 1707 'dependencies': [
1740 'net', 1708 'net',
1741 '../base/base.gyp:base', 1709 '../base/base.gyp:base',
1742 ], 1710 ],
1743 'sources': [ 1711 'sources': [
1744 'tools/net_watcher/net_watcher.cc', 1712 'tools/net_watcher/net_watcher.cc',
1745 ], 1713 ],
1746 }, 1714 },
1747 ], 1715 ],
1748 'conditions': [ 1716 'conditions': [
1717 ['inside_chromium_build==1', {
1718 'targets': [
1719 # This target depends on dependencies not fetched by WebKit's DEPS.
1720 # In particular, ..\chrome\test\data and ..\third_party\python_26 on
1721 # Windows.
1722 {
1723 'target_name': 'net_unittests_run',
1724 'type': 'none',
1725 'dependencies': [
1726 'net_unittests',
1727 ],
1728 'includes': [
1729 'net_unittests.isolate',
1730 ],
1731 'actions': [
1732 {
1733 'action_name': 'isolate',
1734 'inputs': [
1735 'net_unittests.isolate',
1736 '<@(isolate_dependency_tracked)',
1737 ],
1738 'outputs': [
1739 '<(PRODUCT_DIR)/net_unittests.results',
1740 ],
1741 'action': [
1742 'python',
1743 '../tools/isolate/isolate.py',
1744 '<(test_isolation_mode)',
1745 '--outdir', '<(test_isolation_outdir)',
1746 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
1747 '--variable', 'OS', '<(OS)',
1748 '--result', '<@(_outputs)',
1749 '--isolate', 'net_unittests.isolate',
1750 ],
1751 },
1752 ],
1753 },
1754 ],
1755 }],
1749 ['os_posix == 1 and OS != "mac" and OS != "android"', { 1756 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1750 'targets': [ 1757 'targets': [
1751 { 1758 {
1752 'target_name': 'flip_in_mem_edsm_server', 1759 'target_name': 'flip_in_mem_edsm_server',
1753 'type': 'executable', 1760 'type': 'executable',
1754 'cflags': [ 1761 'cflags': [
1755 '-Wno-deprecated', 1762 '-Wno-deprecated',
1756 ], 1763 ],
1757 'dependencies': [ 1764 'dependencies': [
1758 '../base/base.gyp:base', 1765 '../base/base.gyp:base',
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1947 'tools/dump_cache/url_to_filename_encoder.cc', 1954 'tools/dump_cache/url_to_filename_encoder.cc',
1948 'tools/dump_cache/url_to_filename_encoder.h', 1955 'tools/dump_cache/url_to_filename_encoder.h',
1949 'tools/dump_cache/url_utilities.h', 1956 'tools/dump_cache/url_utilities.h',
1950 'tools/dump_cache/url_utilities.cc', 1957 'tools/dump_cache/url_utilities.cc',
1951 ], 1958 ],
1952 }, 1959 },
1953 ], 1960 ],
1954 }], 1961 }],
1955 ], 1962 ],
1956 } 1963 }
OLDNEW
« 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