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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 2067018: Break gyp cycles on Linux. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: remove duplicate vars Created 10 years, 7 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 | « chrome/chrome_installer_util.gypi ('k') | chrome/installer/installer_util.gypi » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'browser_tests_sources_views_specific': [ 7 'browser_tests_sources_views_specific': [
8 'browser/extensions/browser_action_test_util_views.cc', 8 'browser/extensions/browser_action_test_util_views.cc',
9 'browser/views/browser_actions_container_browsertest.cc', 9 'browser/views/browser_actions_container_browsertest.cc',
10 ], 10 ],
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1174 ], 1174 ],
1175 }], 1175 }],
1176 ['OS=="win"', { 1176 ['OS=="win"', {
1177 'defines': [ 1177 'defines': [
1178 '__STD_C', 1178 '__STD_C',
1179 '_CRT_SECURE_NO_DEPRECATE', 1179 '_CRT_SECURE_NO_DEPRECATE',
1180 '_SCL_SECURE_NO_DEPRECATE', 1180 '_SCL_SECURE_NO_DEPRECATE',
1181 ], 1181 ],
1182 'dependencies': [ 1182 'dependencies': [
1183 'chrome_dll_version', 1183 'chrome_dll_version',
1184 'installer/installer.gyp:installer_util_strings', 1184 'installer_util_strings',
1185 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 1185 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
1186 'test_chrome_plugin', # run time dependency 1186 'test_chrome_plugin', # run time dependency
1187 '<(allocator_target)', 1187 '<(allocator_target)',
1188 ], 1188 ],
1189 'include_dirs': [ 1189 'include_dirs': [
1190 '<(DEPTH)/third_party/wtl/include', 1190 '<(DEPTH)/third_party/wtl/include',
1191 ], 1191 ],
1192 'sources': [ 1192 'sources': [
1193 'app/chrome_dll.rc', 1193 'app/chrome_dll.rc',
1194 'test/data/resource.rc', 1194 'test/data/resource.rc',
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 1401 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
1402 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 1402 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
1403 '<@(browser_tests_sources_win_specific)', 1403 '<@(browser_tests_sources_win_specific)',
1404 '<@(browser_tests_sources_views_specific)' 1404 '<@(browser_tests_sources_views_specific)'
1405 ], 1405 ],
1406 'include_dirs': [ 1406 'include_dirs': [
1407 '<(DEPTH)/third_party/wtl/include', 1407 '<(DEPTH)/third_party/wtl/include',
1408 ], 1408 ],
1409 'dependencies': [ 1409 'dependencies': [
1410 'chrome_dll_version', 1410 'chrome_dll_version',
1411 'installer/installer.gyp:installer_util_strings', 1411 'installer_util_strings',
1412 '<(allocator_target)', 1412 '<(allocator_target)',
1413 ], 1413 ],
1414 'configurations': { 1414 'configurations': {
1415 'Debug_Base': { 1415 'Debug_Base': {
1416 'msvs_settings': { 1416 'msvs_settings': {
1417 'VCLinkerTool': { 1417 'VCLinkerTool': {
1418 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1418 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1419 }, 1419 },
1420 }, 1420 },
1421 }, 1421 },
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
2016 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 2016 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
2017 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 2017 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ',
2018 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 2018 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
2019 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 2019 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
2020 ], 2020 ],
2021 'include_dirs': [ 2021 'include_dirs': [
2022 '<(DEPTH)/third_party/wtl/include', 2022 '<(DEPTH)/third_party/wtl/include',
2023 ], 2023 ],
2024 'dependencies': [ 2024 'dependencies': [
2025 'chrome_dll_version', 2025 'chrome_dll_version',
2026 'installer/installer.gyp:installer_util_strings', 2026 'installer_util_strings',
2027 '../views/views.gyp:views', 2027 '../views/views.gyp:views',
2028 '<(allocator_target)', 2028 '<(allocator_target)',
2029 ], 2029 ],
2030 'configurations': { 2030 'configurations': {
2031 'Debug': { 2031 'Debug': {
2032 'msvs_settings': { 2032 'msvs_settings': {
2033 'VCLinkerTool': { 2033 'VCLinkerTool': {
2034 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 2034 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
2035 }, 2035 },
2036 }, 2036 },
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
2476 ] 2476 ]
2477 }], # 'coverage!=0' 2477 }], # 'coverage!=0'
2478 ], # 'conditions' 2478 ], # 'conditions'
2479 } 2479 }
2480 2480
2481 # Local Variables: 2481 # Local Variables:
2482 # tab-width:2 2482 # tab-width:2
2483 # indent-tabs-mode:nil 2483 # indent-tabs-mode:nil
2484 # End: 2484 # End:
2485 # vim: set expandtab tabstop=2 shiftwidth=2: 2485 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_installer_util.gypi ('k') | chrome/installer/installer_util.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698