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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 699001: Move wtl from chrome/third_party to third_party/. This... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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 | « chrome/chrome_renderer.gypi ('k') | chrome/nacl.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_unittest.cc', 9 'browser/views/browser_actions_container_unittest.cc',
10 'browser/views/find_bar_host_browsertest.cc', 10 'browser/views/find_bar_host_browsertest.cc',
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 'test/ui_test_utils_win.cc', 117 'test/ui_test_utils_win.cc',
118 ], 118 ],
119 'conditions': [ 119 'conditions': [
120 ['OS=="linux"', { 120 ['OS=="linux"', {
121 'dependencies': [ 121 'dependencies': [
122 '../build/linux/system.gyp:gtk', 122 '../build/linux/system.gyp:gtk',
123 ], 123 ],
124 }], 124 }],
125 ['OS=="win"', { 125 ['OS=="win"', {
126 'include_dirs': [ 126 'include_dirs': [
127 'third_party/wtl/include', 127 '<(DEPTH)/third_party/wtl/include',
128 ], 128 ],
129 }], 129 }],
130 ], 130 ],
131 }, 131 },
132 { 132 {
133 'target_name': 'test_support_ui', 133 'target_name': 'test_support_ui',
134 'type': '<(library)', 134 'type': '<(library)',
135 'dependencies': [ 135 'dependencies': [
136 'test_support_common', 136 'test_support_common',
137 'chrome_resources', 137 'chrome_resources',
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 'test/automated_ui_tests/automated_ui_tests.h', 227 'test/automated_ui_tests/automated_ui_tests.h',
228 ], 228 ],
229 'conditions': [ 229 'conditions': [
230 ['OS=="linux"', { 230 ['OS=="linux"', {
231 'dependencies': [ 231 'dependencies': [
232 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 232 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
233 ], 233 ],
234 }], 234 }],
235 ['OS=="win"', { 235 ['OS=="win"', {
236 'include_dirs': [ 236 'include_dirs': [
237 'third_party/wtl/include', 237 '<(DEPTH)/third_party/wtl/include',
238 ], 238 ],
239 'dependencies': [ 239 'dependencies': [
240 '<(allocator_target)', 240 '<(allocator_target)',
241 ], 241 ],
242 }], 242 }],
243 ], 243 ],
244 }, 244 },
245 { 245 {
246 'target_name': 'ui_tests', 246 'target_name': 'ui_tests',
247 'type': 'executable', 247 'type': 'executable',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 'browser/sessions/session_restore_uitest.cc', 357 'browser/sessions/session_restore_uitest.cc',
358 # puts up modal dialogs. 358 # puts up modal dialogs.
359 'browser/unload_uitest.cc', 359 'browser/unload_uitest.cc',
360 'test/ui/fast_shutdown_uitest.cc', 360 'test/ui/fast_shutdown_uitest.cc',
361 'test/ui/layout_plugin_uitest.cc', 361 'test/ui/layout_plugin_uitest.cc',
362 'test/ui/omnibox_uitest.cc', 362 'test/ui/omnibox_uitest.cc',
363 ], 363 ],
364 }], 364 }],
365 ['OS=="win"', { 365 ['OS=="win"', {
366 'include_dirs': [ 366 'include_dirs': [
367 'third_party/wtl/include', 367 '<(DEPTH)/third_party/wtl/include',
368 ], 368 ],
369 'dependencies': [ 369 'dependencies': [
370 'crash_service', # run time dependency 370 'crash_service', # run time dependency
371 'security_tests', # run time dependency 371 'security_tests', # run time dependency
372 'test_support_common', 372 'test_support_common',
373 '../google_update/google_update.gyp:google_update', 373 '../google_update/google_update.gyp:google_update',
374 '../views/views.gyp:views', 374 '../views/views.gyp:views',
375 '<(allocator_target)', 375 '<(allocator_target)',
376 ], 376 ],
377 'link_settings': { 377 'link_settings': {
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 '_SCL_SECURE_NO_DEPRECATE', 1044 '_SCL_SECURE_NO_DEPRECATE',
1045 ], 1045 ],
1046 'dependencies': [ 1046 'dependencies': [
1047 'chrome_dll_version', 1047 'chrome_dll_version',
1048 'installer/installer.gyp:installer_util_strings', 1048 'installer/installer.gyp:installer_util_strings',
1049 '../views/views.gyp:views', 1049 '../views/views.gyp:views',
1050 'test_chrome_plugin', # run time dependency 1050 'test_chrome_plugin', # run time dependency
1051 '<(allocator_target)', 1051 '<(allocator_target)',
1052 ], 1052 ],
1053 'include_dirs': [ 1053 'include_dirs': [
1054 'third_party/wtl/include', 1054 '<(DEPTH)/third_party/wtl/include',
1055 ], 1055 ],
1056 'sources': [ 1056 'sources': [
1057 'app/chrome_dll.rc', 1057 'app/chrome_dll.rc',
1058 'test/data/resource.rc', 1058 'test/data/resource.rc',
1059 1059
1060 '<@(views_unit_tests_sources)', 1060 '<@(views_unit_tests_sources)',
1061 1061
1062 # TODO: It would be nice to have these pulled in 1062 # TODO: It would be nice to have these pulled in
1063 # automatically from direct_dependent_settings in 1063 # automatically from direct_dependent_settings in
1064 # their various targets (net.gyp:net_resources, etc.), 1064 # their various targets (net.gyp:net_resources, etc.),
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 'app/chrome_dll_version.rc.version', 1226 'app/chrome_dll_version.rc.version',
1227 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 1227 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
1228 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1228 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1229 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 1229 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ',
1230 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1230 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1231 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 1231 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
1232 '<@(browser_tests_sources_win_specific)', 1232 '<@(browser_tests_sources_win_specific)',
1233 '<@(browser_tests_sources_views_specific)' 1233 '<@(browser_tests_sources_views_specific)'
1234 ], 1234 ],
1235 'include_dirs': [ 1235 'include_dirs': [
1236 'third_party/wtl/include', 1236 '<(DEPTH)/third_party/wtl/include',
1237 ], 1237 ],
1238 'dependencies': [ 1238 'dependencies': [
1239 'chrome_dll_version', 1239 'chrome_dll_version',
1240 'installer/installer.gyp:installer_util_strings', 1240 'installer/installer.gyp:installer_util_strings',
1241 '<(allocator_target)', 1241 '<(allocator_target)',
1242 ], 1242 ],
1243 'configurations': { 1243 'configurations': {
1244 'Debug_Base': { 1244 'Debug_Base': {
1245 'msvs_settings': { 1245 'msvs_settings': {
1246 'VCLinkerTool': { 1246 'VCLinkerTool': {
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1502 ], 1502 ],
1503 'include_dirs': [ 1503 'include_dirs': [
1504 '..', 1504 '..',
1505 ], 1505 ],
1506 'sources': [ 1506 'sources': [
1507 'test/url_fetch_test/url_fetch_test.cc', 1507 'test/url_fetch_test/url_fetch_test.cc',
1508 ], 1508 ],
1509 'conditions': [ 1509 'conditions': [
1510 ['OS=="win"', { 1510 ['OS=="win"', {
1511 'include_dirs': [ 1511 'include_dirs': [
1512 'third_party/wtl/include', 1512 '<(DEPTH)/third_party/wtl/include',
1513 ], 1513 ],
1514 'dependencies': [ 1514 'dependencies': [
1515 '<(allocator_target)', 1515 '<(allocator_target)',
1516 ], 1516 ],
1517 }], # OS="win" 1517 }], # OS="win"
1518 ], # conditions 1518 ], # conditions
1519 }, 1519 },
1520 { 1520 {
1521 'target_name': 'sync_unit_tests', 1521 'target_name': 'sync_unit_tests',
1522 'type': 'executable', 1522 'type': 'executable',
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 'app/chrome_dll.rc', 1701 'app/chrome_dll.rc',
1702 'app/chrome_dll_version.rc.version', 1702 'app/chrome_dll_version.rc.version',
1703 'test/data/resource.rc', 1703 'test/data/resource.rc',
1704 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 1704 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
1705 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1705 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1706 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ', 1706 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc ',
1707 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1707 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1708 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 1708 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
1709 ], 1709 ],
1710 'include_dirs': [ 1710 'include_dirs': [
1711 'third_party/wtl/include', 1711 '<(DEPTH)/third_party/wtl/include',
1712 ], 1712 ],
1713 'dependencies': [ 1713 'dependencies': [
1714 'chrome_dll_version', 1714 'chrome_dll_version',
1715 'installer/installer.gyp:installer_util_strings', 1715 'installer/installer.gyp:installer_util_strings',
1716 '../views/views.gyp:views', 1716 '../views/views.gyp:views',
1717 '<(allocator_target)', 1717 '<(allocator_target)',
1718 ], 1718 ],
1719 'configurations': { 1719 'configurations': {
1720 'Debug': { 1720 'Debug': {
1721 'msvs_settings': { 1721 'msvs_settings': {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
1812 'test_support_common', 1812 'test_support_common',
1813 'test_support_ui', 1813 'test_support_ui',
1814 '../skia/skia.gyp:skia', 1814 '../skia/skia.gyp:skia',
1815 '../testing/gtest.gyp:gtest', 1815 '../testing/gtest.gyp:gtest',
1816 '../third_party/libxml/libxml.gyp:libxml', 1816 '../third_party/libxml/libxml.gyp:libxml',
1817 '../third_party/libxslt/libxslt.gyp:libxslt', 1817 '../third_party/libxslt/libxslt.gyp:libxslt',
1818 '../third_party/npapi/npapi.gyp:npapi', 1818 '../third_party/npapi/npapi.gyp:npapi',
1819 ], 1819 ],
1820 'include_dirs': [ 1820 'include_dirs': [
1821 '..', 1821 '..',
1822 'third_party/wtl/include', 1822 '<(DEPTH)/third_party/wtl/include',
1823 ], 1823 ],
1824 'sources': [ 1824 'sources': [
1825 'test/plugin/plugin_test.cpp', 1825 'test/plugin/plugin_test.cpp',
1826 ], 1826 ],
1827 'conditions': [ 1827 'conditions': [
1828 ['OS=="win"', { 1828 ['OS=="win"', {
1829 'dependencies': [ 1829 'dependencies': [
1830 '<(allocator_target)', 1830 '<(allocator_target)',
1831 ], 1831 ],
1832 },], 1832 },],
(...skipping 22 matching lines...) Expand all
1855 'dependencies': [ 1855 'dependencies': [
1856 'chrome_resources', 1856 'chrome_resources',
1857 'chrome_strings', 1857 'chrome_strings',
1858 'test_support_common', 1858 'test_support_common',
1859 'test_support_ui', 1859 'test_support_ui',
1860 '../skia/skia.gyp:skia', 1860 '../skia/skia.gyp:skia',
1861 '../testing/gtest.gyp:gtest', 1861 '../testing/gtest.gyp:gtest',
1862 ], 1862 ],
1863 'include_dirs': [ 1863 'include_dirs': [
1864 '..', 1864 '..',
1865 'third_party/wtl/include', 1865 '<(DEPTH)/third_party/wtl/include',
1866 ], 1866 ],
1867 'sources': [ 1867 'sources': [
1868 'test/selenium/selenium_test.cc', 1868 'test/selenium/selenium_test.cc',
1869 ], 1869 ],
1870 'conditions': [ 1870 'conditions': [
1871 ['OS=="win"', { 1871 ['OS=="win"', {
1872 'dependencies': [ 1872 'dependencies': [
1873 '<(allocator_target)', 1873 '<(allocator_target)',
1874 ], 1874 ],
1875 },], 1875 },],
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
2076 ] 2076 ]
2077 }], # 'coverage!=0' 2077 }], # 'coverage!=0'
2078 ], # 'conditions' 2078 ], # 'conditions'
2079 } 2079 }
2080 2080
2081 # Local Variables: 2081 # Local Variables:
2082 # tab-width:2 2082 # tab-width:2
2083 # indent-tabs-mode:nil 2083 # indent-tabs-mode:nil
2084 # End: 2084 # End:
2085 # vim: set expandtab tabstop=2 shiftwidth=2: 2085 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/nacl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698