| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'includes': [ | 5 'includes': [ |
| 6 'js_unittest_vars.gypi', | 6 'js_unittest_vars.gypi', |
| 7 ], | 7 ], |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'interactive_ui_tests', | 10 'target_name': 'interactive_ui_tests', |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 'browser/renderer_context_menu/render_view_context_menu_browsertest_util
.h', | 80 'browser/renderer_context_menu/render_view_context_menu_browsertest_util
.h', |
| 81 'browser/task_manager/task_manager_browsertest_util.cc', | 81 'browser/task_manager/task_manager_browsertest_util.cc', |
| 82 'browser/ui/app_list/app_list_service_interactive_uitest.cc', | 82 'browser/ui/app_list/app_list_service_interactive_uitest.cc', |
| 83 'browser/ui/app_list/app_list_service_mac_interactive_uitest.mm', | 83 'browser/ui/app_list/app_list_service_mac_interactive_uitest.mm', |
| 84 'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc', | 84 'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc', |
| 85 'browser/ui/browser_focus_uitest.cc', | 85 'browser/ui/browser_focus_uitest.cc', |
| 86 'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm', | 86 'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm', |
| 87 'browser/ui/find_bar/find_bar_host_interactive_uitest.cc', | 87 'browser/ui/find_bar/find_bar_host_interactive_uitest.cc', |
| 88 'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc'
, | 88 'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc'
, |
| 89 'browser/ui/fullscreen/fullscreen_controller_state_interactive_browserte
st.cc', | 89 'browser/ui/fullscreen/fullscreen_controller_state_interactive_browserte
st.cc', |
| 90 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc', | |
| 91 'browser/ui/gtk/bookmarks/bookmark_bubble_gtk_browsertest.cc', | |
| 92 'browser/ui/omnibox/omnibox_view_browsertest.cc', | 90 'browser/ui/omnibox/omnibox_view_browsertest.cc', |
| 93 'browser/ui/panels/base_panel_browser_test.cc', | 91 'browser/ui/panels/base_panel_browser_test.cc', |
| 94 'browser/ui/panels/base_panel_browser_test.h', | 92 'browser/ui/panels/base_panel_browser_test.h', |
| 95 'browser/ui/panels/detached_panel_browsertest.cc', | 93 'browser/ui/panels/detached_panel_browsertest.cc', |
| 96 'browser/ui/panels/docked_panel_browsertest.cc', | 94 'browser/ui/panels/docked_panel_browsertest.cc', |
| 97 'browser/ui/panels/panel_browsertest.cc', | 95 'browser/ui/panels/panel_browsertest.cc', |
| 98 'browser/ui/panels/panel_drag_browsertest.cc', | 96 'browser/ui/panels/panel_drag_browsertest.cc', |
| 99 'browser/ui/panels/panel_resize_browsertest.cc', | 97 'browser/ui/panels/panel_resize_browsertest.cc', |
| 100 'browser/ui/panels/stacked_panel_browsertest.cc', | 98 'browser/ui/panels/stacked_panel_browsertest.cc', |
| 101 'browser/ui/panels/test_panel_active_state_observer.cc', | 99 'browser/ui/panels/test_panel_active_state_observer.cc', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 'browser/ui/views/panels/panel_view_browsertest.cc', | 131 'browser/ui/views/panels/panel_view_browsertest.cc', |
| 134 'browser/ui/views/ssl_client_certificate_selector_browsertest.cc', | 132 'browser/ui/views/ssl_client_certificate_selector_browsertest.cc', |
| 135 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', | 133 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', |
| 136 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h', | 134 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h', |
| 137 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc', | 135 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc', |
| 138 'browser/ui/views/toolbar/toolbar_button_test.cc', | 136 'browser/ui/views/toolbar/toolbar_button_test.cc', |
| 139 'test/base/interactive_test_utils.cc', | 137 'test/base/interactive_test_utils.cc', |
| 140 'test/base/interactive_test_utils.h', | 138 'test/base/interactive_test_utils.h', |
| 141 'test/base/interactive_test_utils_aura.cc', | 139 'test/base/interactive_test_utils_aura.cc', |
| 142 'test/base/interactive_test_utils_aura.h', | 140 'test/base/interactive_test_utils_aura.h', |
| 143 'test/base/interactive_test_utils_gtk.cc', | |
| 144 'test/base/interactive_test_utils_mac.mm', | 141 'test/base/interactive_test_utils_mac.mm', |
| 145 'test/base/interactive_test_utils_views.cc', | 142 'test/base/interactive_test_utils_views.cc', |
| 146 'test/base/interactive_test_utils_win.cc', | 143 'test/base/interactive_test_utils_win.cc', |
| 147 'test/base/interactive_ui_tests_main.cc', | 144 'test/base/interactive_ui_tests_main.cc', |
| 148 'test/base/view_event_test_base.cc', | 145 'test/base/view_event_test_base.cc', |
| 149 'test/base/view_event_test_base.h', | 146 'test/base/view_event_test_base.h', |
| 150 'test/ppapi/ppapi_interactive_browsertest.cc', | 147 'test/ppapi/ppapi_interactive_browsertest.cc', |
| 151 ], | 148 ], |
| 152 'conditions': [ | 149 'conditions': [ |
| 153 ['use_x11==1', { | 150 ['use_x11==1', { |
| 154 'dependencies': [ | 151 'dependencies': [ |
| 155 '../build/linux/system.gyp:xtst', | 152 '../build/linux/system.gyp:xtst', |
| 156 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 153 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 157 ], | 154 ], |
| 158 }], | 155 }], |
| 159 ['toolkit_uses_gtk == 1', { | 156 ['toolkit_uses_gtk == 1', { |
| 160 'dependencies': [ | 157 'dependencies': [ |
| 161 '../build/linux/system.gyp:gtk', | 158 '../build/linux/system.gyp:gtk', |
| 162 ], | 159 ], |
| 163 'sources!': [ | |
| 164 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', | |
| 165 ], | |
| 166 }, { | 160 }, { |
| 167 'sources!': [ | 161 'sources!': [ |
| 168 'browser/notifications/desktop_notifications_unittest.cc', | 162 'browser/notifications/desktop_notifications_unittest.cc', |
| 169 'browser/notifications/desktop_notifications_unittest.h', | 163 'browser/notifications/desktop_notifications_unittest.h', |
| 170 'browser/notifications/notification_browsertest.cc', | 164 'browser/notifications/notification_browsertest.cc', |
| 171 ] | 165 ] |
| 172 }], | 166 }], |
| 173 ['OS=="linux" and use_aura==1', { | 167 ['OS=="linux" and use_aura==1', { |
| 174 # TODO(gbillock): aura linux does not support the automation for | 168 # TODO(gbillock): aura linux does not support the automation for |
| 175 # SendMouseMoveNotifyWhenDone | 169 # SendMouseMoveNotifyWhenDone |
| 176 'sources!': [ | 170 'sources!': [ |
| 177 'browser/ui/views/toolbar/toolbar_button_test.cc', | 171 'browser/ui/views/toolbar/toolbar_button_test.cc', |
| 178 ], | 172 ], |
| 179 }], | 173 }], |
| 180 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 174 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 181 'dependencies': [ | 175 'dependencies': [ |
| 182 '../build/linux/system.gyp:ssl', | 176 '../build/linux/system.gyp:ssl', |
| 183 ], | 177 ], |
| 184 }], | 178 }], |
| 185 ['toolkit_uses_gtk == 1 and toolkit_views == 0', { | |
| 186 'sources!': [ | |
| 187 # TODO(port) | |
| 188 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', | |
| 189 'browser/ui/views/button_dropdown_test.cc', | |
| 190 'browser/ui/views/constrained_window_views_browsertest.cc', | |
| 191 'browser/ui/views/crypto_module_password_dialog_view_unittest.cc', | |
| 192 'browser/ui/views/find_bar_host_interactive_uitest.cc', | |
| 193 'browser/ui/views/keyboard_access_browsertest.cc', | |
| 194 'browser/ui/views/menu_item_view_test.cc', | |
| 195 'browser/ui/views/menu_model_adapter_test.cc', | |
| 196 'test/base/view_event_test_base.cc', | |
| 197 'test/base/view_event_test_base.h', | |
| 198 ], | |
| 199 }], | |
| 200 ['OS=="linux" and chromeos==0', { | 179 ['OS=="linux" and chromeos==0', { |
| 201 'sources!': [ | 180 'sources!': [ |
| 202 # TODO(port): Disable all the interactive panel tests on all linux | 181 # TODO(port): Disable all the interactive panel tests on all linux |
| 203 # platforms. These are badly busted on linux_aura, also time out | 182 # platforms. These are badly busted on linux_aura, also time out |
| 204 # when run under openbox. | 183 # when run under openbox. |
| 205 # | 184 # |
| 206 # Merge this back into the next block post switch to linux_aura. | 185 # Merge this back into the next block post switch to linux_aura. |
| 207 'browser/ui/panels/base_panel_browser_test.cc', | 186 'browser/ui/panels/base_panel_browser_test.cc', |
| 208 'browser/ui/panels/base_panel_browser_test.h', | 187 'browser/ui/panels/base_panel_browser_test.h', |
| 209 'browser/ui/panels/detached_panel_browsertest.cc', | 188 'browser/ui/panels/detached_panel_browsertest.cc', |
| (...skipping 20 matching lines...) Expand all Loading... |
| 230 'browser/ui/views/keyboard_access_browsertest.cc', | 209 'browser/ui/views/keyboard_access_browsertest.cc', |
| 231 ], | 210 ], |
| 232 }], | 211 }], |
| 233 ['use_ash==1', { | 212 ['use_ash==1', { |
| 234 'sources': [ | 213 'sources': [ |
| 235 '../ash/drag_drop/drag_drop_interactive_uitest.cc', | 214 '../ash/drag_drop/drag_drop_interactive_uitest.cc', |
| 236 '../ash/wm/ash_native_cursor_manager_interactive_uitest.cc', | 215 '../ash/wm/ash_native_cursor_manager_interactive_uitest.cc', |
| 237 'browser/ui/window_sizer/window_sizer_ash_uitest.cc', | 216 'browser/ui/window_sizer/window_sizer_ash_uitest.cc', |
| 238 ], | 217 ], |
| 239 }], | 218 }], |
| 240 ['OS=="linux" and toolkit_views==1', { | |
| 241 'sources!': [ | |
| 242 # TODO(port) | |
| 243 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc', | |
| 244 ], | |
| 245 }], | |
| 246 ['OS=="mac"', { | 219 ['OS=="mac"', { |
| 247 'sources!': [ | 220 'sources!': [ |
| 248 # TODO(port) | 221 # TODO(port) |
| 249 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', | 222 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', |
| 250 'browser/ui/views/constrained_window_views_browsertest.cc', | 223 'browser/ui/views/constrained_window_views_browsertest.cc', |
| 251 'browser/ui/views/find_bar_host_interactive_uitest.cc', | 224 'browser/ui/views/find_bar_host_interactive_uitest.cc', |
| 252 'browser/ui/views/keyboard_access_browsertest.cc', | 225 'browser/ui/views/keyboard_access_browsertest.cc', |
| 253 'browser/ui/views/menu_item_view_test.cc', | 226 'browser/ui/views/menu_item_view_test.cc', |
| 254 'browser/ui/views/menu_model_adapter_test.cc', | 227 'browser/ui/views/menu_model_adapter_test.cc', |
| 255 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', | 228 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', |
| (...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1379 'browser/ui/cocoa/omnibox/omnibox_view_mac_browsertest.mm', | 1352 'browser/ui/cocoa/omnibox/omnibox_view_mac_browsertest.mm', |
| 1380 'browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm', | 1353 'browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm', |
| 1381 'browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm', | 1354 'browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm', |
| 1382 'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_b
rowsertest.mm', | 1355 'browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_b
rowsertest.mm', |
| 1383 'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm', | 1356 'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm', |
| 1384 'browser/ui/cocoa/view_id_util_browsertest.mm', | 1357 'browser/ui/cocoa/view_id_util_browsertest.mm', |
| 1385 'browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
', | 1358 'browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
', |
| 1386 'browser/ui/find_bar/find_bar_host_browsertest.cc', | 1359 'browser/ui/find_bar/find_bar_host_browsertest.cc', |
| 1387 'browser/ui/fullscreen/fullscreen_controller_browsertest.cc', | 1360 'browser/ui/fullscreen/fullscreen_controller_browsertest.cc', |
| 1388 'browser/ui/global_error/global_error_service_browsertest.cc', | 1361 'browser/ui/global_error/global_error_service_browsertest.cc', |
| 1389 'browser/ui/gtk/bubble/bubble_gtk_browsertest.cc', | |
| 1390 'browser/ui/gtk/confirm_bubble_gtk_browsertest.cc', | |
| 1391 'browser/ui/gtk/location_bar_view_gtk_browsertest.cc', | |
| 1392 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc', | |
| 1393 'browser/ui/gtk/view_id_util_browsertest.cc', | |
| 1394 'browser/ui/login/login_prompt_browsertest.cc', | 1362 'browser/ui/login/login_prompt_browsertest.cc', |
| 1395 'browser/ui/panels/panel_extension_browsertest.cc', | 1363 'browser/ui/panels/panel_extension_browsertest.cc', |
| 1396 'browser/ui/pdf/pdf_browsertest.cc', | 1364 'browser/ui/pdf/pdf_browsertest.cc', |
| 1397 'browser/ui/prefs/prefs_tab_helper_browsertest.cc', | 1365 'browser/ui/prefs/prefs_tab_helper_browsertest.cc', |
| 1398 'browser/ui/startup/startup_browser_creator_browsertest.cc', | 1366 'browser/ui/startup/startup_browser_creator_browsertest.cc', |
| 1399 'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc', | 1367 'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.cc', |
| 1400 'browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc', | 1368 'browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc', |
| 1401 'browser/ui/tab_modal_confirm_dialog_browsertest.cc', | 1369 'browser/ui/tab_modal_confirm_dialog_browsertest.cc', |
| 1402 'browser/ui/tab_modal_confirm_dialog_browsertest.h', | 1370 'browser/ui/tab_modal_confirm_dialog_browsertest.h', |
| 1403 'browser/ui/toolbar/test_toolbar_model.cc', | 1371 'browser/ui/toolbar/test_toolbar_model.cc', |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1599 'conditions': [ | 1567 'conditions': [ |
| 1600 ['incremental_chrome_dll==1', { | 1568 ['incremental_chrome_dll==1', { |
| 1601 'UseLibraryDependencyInputs': "true", | 1569 'UseLibraryDependencyInputs': "true", |
| 1602 }], | 1570 }], |
| 1603 ], | 1571 ], |
| 1604 }, | 1572 }, |
| 1605 }, | 1573 }, |
| 1606 'conditions': [ | 1574 'conditions': [ |
| 1607 ['enable_one_click_signin==0', { | 1575 ['enable_one_click_signin==0', { |
| 1608 'sources!': [ | 1576 'sources!': [ |
| 1609 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc', | |
| 1610 'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.
cc', | 1577 'browser/ui/sync/one_click_signin_bubble_links_delegate_browsertest.
cc', |
| 1611 ] | 1578 ] |
| 1612 }], | 1579 }], |
| 1613 ['enable_autofill_dialog==0', { | 1580 ['enable_autofill_dialog==0', { |
| 1614 'sources!': [ | 1581 'sources!': [ |
| 1615 'browser/ui/autofill/autofill_dialog_controller_browsertest.cc', | 1582 'browser/ui/autofill/autofill_dialog_controller_browsertest.cc', |
| 1616 ] | 1583 ] |
| 1617 }], | 1584 }], |
| 1618 ['disable_nacl==0', { | 1585 ['disable_nacl==0', { |
| 1619 'sources':[ | 1586 'sources':[ |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1768 ['enable_captive_portal_detection!=1', { | 1735 ['enable_captive_portal_detection!=1', { |
| 1769 'sources/': [ | 1736 'sources/': [ |
| 1770 ['exclude', '^browser/captive_portal/'], | 1737 ['exclude', '^browser/captive_portal/'], |
| 1771 ], | 1738 ], |
| 1772 }], | 1739 }], |
| 1773 ['internal_pdf', { | 1740 ['internal_pdf', { |
| 1774 'dependencies': [ | 1741 'dependencies': [ |
| 1775 '../pdf/pdf.gyp:pdf', | 1742 '../pdf/pdf.gyp:pdf', |
| 1776 ], | 1743 ], |
| 1777 }], | 1744 }], |
| 1778 ['OS!="linux" or toolkit_views==1', { | |
| 1779 'sources!': [ | |
| 1780 'browser/ui/gtk/view_id_util_browsertest.cc', | |
| 1781 ], | |
| 1782 }], | |
| 1783 ['enable_webrtc==0', { | 1745 ['enable_webrtc==0', { |
| 1784 'sources!': [ | 1746 'sources!': [ |
| 1785 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br
owsertest.cc', | 1747 'browser/extensions/api/webrtc_audio_private/webrtc_audio_private_br
owsertest.cc', |
| 1786 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat
e_apitest.cc', | 1748 'browser/extensions/api/webrtc_logging_private/webrtc_logging_privat
e_apitest.cc', |
| 1787 'browser/media/chrome_webrtc_browsertest.cc', | 1749 'browser/media/chrome_webrtc_browsertest.cc', |
| 1788 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc'
, | 1750 'browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc'
, |
| 1789 ], | 1751 ], |
| 1790 }], | 1752 }], |
| 1791 ['OS=="win"', { | 1753 ['OS=="win"', { |
| 1792 'sources': [ | 1754 'sources': [ |
| (...skipping 27 matching lines...) Expand all Loading... |
| 1820 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes
t.cc', | 1782 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes
t.cc', |
| 1821 ], | 1783 ], |
| 1822 }, { # else: OS != "win" | 1784 }, { # else: OS != "win" |
| 1823 'sources!': [ | 1785 'sources!': [ |
| 1824 'app/chrome_command_ids.h', | 1786 'app/chrome_command_ids.h', |
| 1825 'app/chrome_dll.rc', | 1787 'app/chrome_dll.rc', |
| 1826 'app/chrome_dll_resource.h', | 1788 'app/chrome_dll_resource.h', |
| 1827 'app/chrome_version.rc.version', | 1789 'app/chrome_version.rc.version', |
| 1828 ], | 1790 ], |
| 1829 }], | 1791 }], |
| 1830 ['toolkit_uses_gtk == 1', { | |
| 1831 'dependencies': [ | |
| 1832 '../build/linux/system.gyp:gtk', | |
| 1833 ], | |
| 1834 }], | |
| 1835 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 1792 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 1836 'dependencies': [ | 1793 'dependencies': [ |
| 1837 '../build/linux/system.gyp:ssl', | 1794 '../build/linux/system.gyp:ssl', |
| 1838 ], | 1795 ], |
| 1839 }], | 1796 }], |
| 1840 ['OS=="mac"', { | 1797 ['OS=="mac"', { |
| 1841 # TODO(mark): We really want this for all non-static library | 1798 # TODO(mark): We really want this for all non-static library |
| 1842 # targets, but when we tried to pull it up to the common.gypi | 1799 # targets, but when we tried to pull it up to the common.gypi |
| 1843 # level, it broke other things like the ui and startup tests. *shrug* | 1800 # level, it broke other things like the ui and startup tests. *shrug* |
| 1844 'xcode_settings': { | 1801 'xcode_settings': { |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2115 'app/chrome_dll.rc', | 2072 'app/chrome_dll.rc', |
| 2116 'app/chrome_dll_resource.h', | 2073 'app/chrome_dll_resource.h', |
| 2117 'app/chrome_version.rc.version', | 2074 'app/chrome_version.rc.version', |
| 2118 ], | 2075 ], |
| 2119 }], | 2076 }], |
| 2120 ['use_x11==1', { | 2077 ['use_x11==1', { |
| 2121 'dependencies': [ | 2078 'dependencies': [ |
| 2122 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2079 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2123 ], | 2080 ], |
| 2124 }], | 2081 }], |
| 2125 ['toolkit_uses_gtk == 1', { | |
| 2126 'dependencies': [ | |
| 2127 '../build/linux/system.gyp:gtk', | |
| 2128 ], | |
| 2129 }], | |
| 2130 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2082 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 2131 'dependencies': [ | 2083 'dependencies': [ |
| 2132 '../build/linux/system.gyp:ssl', | 2084 '../build/linux/system.gyp:ssl', |
| 2133 ], | 2085 ], |
| 2134 }], | 2086 }], |
| 2135 ['OS=="mac"', { | 2087 ['OS=="mac"', { |
| 2136 # TODO(mark): We really want this for all non-static library | 2088 # TODO(mark): We really want this for all non-static library |
| 2137 # targets, but when we tried to pull it up to the common.gypi | 2089 # targets, but when we tried to pull it up to the common.gypi |
| 2138 # level, it broke other things like the ui and startup tests. *shrug* | 2090 # level, it broke other things like the ui and startup tests. *shrug* |
| 2139 'xcode_settings': { | 2091 'xcode_settings': { |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2345 'browser/sync/test/integration/two_client_extension_settings_and_app_set
tings_sync_test.cc', | 2297 'browser/sync/test/integration/two_client_extension_settings_and_app_set
tings_sync_test.cc', |
| 2346 'browser/sync/test/integration/two_client_extensions_sync_test.cc', | 2298 'browser/sync/test/integration/two_client_extensions_sync_test.cc', |
| 2347 'browser/sync/test/integration/two_client_passwords_sync_test.cc', | 2299 'browser/sync/test/integration/two_client_passwords_sync_test.cc', |
| 2348 'browser/sync/test/integration/two_client_preferences_sync_test.cc', | 2300 'browser/sync/test/integration/two_client_preferences_sync_test.cc', |
| 2349 'browser/sync/test/integration/two_client_search_engines_sync_test.cc', | 2301 'browser/sync/test/integration/two_client_search_engines_sync_test.cc', |
| 2350 'browser/sync/test/integration/two_client_sessions_sync_test.cc', | 2302 'browser/sync/test/integration/two_client_sessions_sync_test.cc', |
| 2351 'browser/sync/test/integration/two_client_themes_sync_test.cc', | 2303 'browser/sync/test/integration/two_client_themes_sync_test.cc', |
| 2352 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', | 2304 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', |
| 2353 ], | 2305 ], |
| 2354 'conditions': [ | 2306 'conditions': [ |
| 2355 ['toolkit_uses_gtk == 1', { | |
| 2356 'dependencies': [ | |
| 2357 '../build/linux/system.gyp:gtk', | |
| 2358 ], | |
| 2359 }], | |
| 2360 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2307 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 2361 'dependencies': [ | 2308 'dependencies': [ |
| 2362 '../build/linux/system.gyp:ssl', | 2309 '../build/linux/system.gyp:ssl', |
| 2363 ], | 2310 ], |
| 2364 }], | 2311 }], |
| 2365 ['OS=="mac"', { | 2312 ['OS=="mac"', { |
| 2366 # The sync_integration_tests do not run on mac without this flag. | 2313 # The sync_integration_tests do not run on mac without this flag. |
| 2367 # Search for comments about "xcode_settings" elsewhere in this file. | 2314 # Search for comments about "xcode_settings" elsewhere in this file. |
| 2368 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 2315 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 2369 # Dictionary sync is disabled on Mac. | 2316 # Dictionary sync is disabled on Mac. |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2455 'browser/sync/test/integration/performance/extensions_sync_perf_test.cc'
, | 2402 'browser/sync/test/integration/performance/extensions_sync_perf_test.cc'
, |
| 2456 'browser/sync/test/integration/performance/sync_timing_helper.cc', | 2403 'browser/sync/test/integration/performance/sync_timing_helper.cc', |
| 2457 'browser/sync/test/integration/performance/sync_timing_helper.h', | 2404 'browser/sync/test/integration/performance/sync_timing_helper.h', |
| 2458 'browser/sync/test/integration/performance/passwords_sync_perf_test.cc', | 2405 'browser/sync/test/integration/performance/passwords_sync_perf_test.cc', |
| 2459 'browser/sync/test/integration/performance/sessions_sync_perf_test.cc', | 2406 'browser/sync/test/integration/performance/sessions_sync_perf_test.cc', |
| 2460 'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc'
, | 2407 'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc'
, |
| 2461 'test/base/browser_perf_tests_main.cc', | 2408 'test/base/browser_perf_tests_main.cc', |
| 2462 'test/data/resource.rc', | 2409 'test/data/resource.rc', |
| 2463 ], | 2410 ], |
| 2464 'conditions': [ | 2411 'conditions': [ |
| 2465 ['toolkit_uses_gtk == 1', { | |
| 2466 'dependencies': [ | |
| 2467 '../build/linux/system.gyp:gtk', | |
| 2468 ], | |
| 2469 }], | |
| 2470 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2412 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { |
| 2471 'dependencies': [ | 2413 'dependencies': [ |
| 2472 '../build/linux/system.gyp:ssl', | 2414 '../build/linux/system.gyp:ssl', |
| 2473 ], | 2415 ], |
| 2474 }], | 2416 }], |
| 2475 ['OS=="mac"', { | 2417 ['OS=="mac"', { |
| 2476 # The sync_performance_tests do not run on mac without this flag. | 2418 # The sync_performance_tests do not run on mac without this flag. |
| 2477 # Search for comments about "xcode_settings" elsewhere in this file. | 2419 # Search for comments about "xcode_settings" elsewhere in this file. |
| 2478 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 2420 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 2479 # Dictionary sync is disabled on Mac. | 2421 # Dictionary sync is disabled on Mac. |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2642 'test/perf/perftests.cc', | 2584 'test/perf/perftests.cc', |
| 2643 'test/perf/url_parse_perftest.cc', | 2585 'test/perf/url_parse_perftest.cc', |
| 2644 '../content/browser/net/sqlite_persistent_cookie_store_perftest.cc', | 2586 '../content/browser/net/sqlite_persistent_cookie_store_perftest.cc', |
| 2645 ], | 2587 ], |
| 2646 'conditions': [ | 2588 'conditions': [ |
| 2647 ['use_x11==1', { | 2589 ['use_x11==1', { |
| 2648 'dependencies': [ | 2590 'dependencies': [ |
| 2649 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2591 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2650 ], | 2592 ], |
| 2651 }], | 2593 }], |
| 2652 ['toolkit_uses_gtk == 1', { | |
| 2653 'dependencies': [ | |
| 2654 '../build/linux/system.gyp:gtk', | |
| 2655 ], | |
| 2656 }], | |
| 2657 ['OS=="win"', { | 2594 ['OS=="win"', { |
| 2658 'configurations': { | 2595 'configurations': { |
| 2659 'Debug_Base': { | 2596 'Debug_Base': { |
| 2660 'msvs_settings': { | 2597 'msvs_settings': { |
| 2661 'VCLinkerTool': { | 2598 'VCLinkerTool': { |
| 2662 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 2599 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 2663 }, | 2600 }, |
| 2664 }, | 2601 }, |
| 2665 }, | 2602 }, |
| 2666 }, | 2603 }, |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2969 ['enable_webrtc==1', { | 2906 ['enable_webrtc==1', { |
| 2970 'dependencies': [ | 2907 'dependencies': [ |
| 2971 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 2908 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 2972 ] | 2909 ] |
| 2973 }], | 2910 }], |
| 2974 ], | 2911 ], |
| 2975 }] | 2912 }] |
| 2976 }], | 2913 }], |
| 2977 ], # 'conditions' | 2914 ], # 'conditions' |
| 2978 } | 2915 } |
| OLD | NEW |