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

Side by Side Diff: net/net.gyp

Issue 10829089: Remove repeated target definition from net.gyp (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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
« 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 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after
1830 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 1830 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
1831 '../build/temp_gyp/googleurl.gyp:googleurl', 1831 '../build/temp_gyp/googleurl.gyp:googleurl',
1832 '../testing/gtest.gyp:gtest', 1832 '../testing/gtest.gyp:gtest',
1833 ], 1833 ],
1834 'sources': [ 1834 'sources': [
1835 'tools/fetch/fetch_client.cc', 1835 'tools/fetch/fetch_client.cc',
1836 ], 1836 ],
1837 }, 1837 },
1838 ], 1838 ],
1839 }], 1839 }],
1840 ['inside_chromium_build==1', {
1841 'targets': [
1842 # This target depends on dependencies not fetched by WebKit's DEPS.
1843 # In particular, ..\chrome\test\data and ..\third_party\python_26 on
1844 # Windows.
1845 {
1846 'target_name': 'net_unittests_run',
1847 'type': 'none',
1848 'dependencies': [
1849 'net_unittests',
1850 ],
1851 'includes': [
1852 'net_unittests.isolate',
1853 ],
1854 'actions': [
1855 {
1856 'action_name': 'isolate',
1857 'inputs': [
1858 'net_unittests.isolate',
1859 '<@(isolate_dependency_tracked)',
1860 ],
1861 'outputs': [
1862 '<(PRODUCT_DIR)/net_unittests.results',
1863 ],
1864 'action': [
1865 'python',
1866 '../tools/isolate/isolate.py',
1867 '<(test_isolation_mode)',
1868 '--outdir', '<(test_isolation_outdir)',
1869 '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
1870 '--variable', 'OS', '<(OS)',
1871 '--result', '<@(_outputs)',
1872 '--isolate', 'net_unittests.isolate',
1873 ],
1874 },
1875 ],
1876 },
1877 ],
1878 }],
1879 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 1840 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
1880 'targets': [ 1841 'targets': [
1881 { 1842 {
1882 'target_name': 'flip_in_mem_edsm_server', 1843 'target_name': 'flip_in_mem_edsm_server',
1883 'type': 'executable', 1844 'type': 'executable',
1884 'cflags': [ 1845 'cflags': [
1885 '-Wno-deprecated', 1846 '-Wno-deprecated',
1886 ], 1847 ],
1887 'dependencies': [ 1848 'dependencies': [
1888 '../base/base.gyp:base', 1849 '../base/base.gyp:base',
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
2109 '--result', '<@(_outputs)', 2070 '--result', '<@(_outputs)',
2110 '--isolate', 'net_unittests.isolate', 2071 '--isolate', 'net_unittests.isolate',
2111 ], 2072 ],
2112 }, 2073 },
2113 ], 2074 ],
2114 }, 2075 },
2115 ], 2076 ],
2116 }], 2077 }],
2117 ], 2078 ],
2118 } 2079 }
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