| 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 'test/base/view_event_test_base.h', | 144 'test/base/view_event_test_base.h', |
| 145 'test/ppapi/ppapi_interactive_browsertest.cc', | 145 'test/ppapi/ppapi_interactive_browsertest.cc', |
| 146 ], | 146 ], |
| 147 'conditions': [ | 147 'conditions': [ |
| 148 ['use_x11==1', { | 148 ['use_x11==1', { |
| 149 'dependencies': [ | 149 'dependencies': [ |
| 150 '../build/linux/system.gyp:xtst', | 150 '../build/linux/system.gyp:xtst', |
| 151 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 151 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 152 ], | 152 ], |
| 153 }], | 153 }], |
| 154 ['toolkit_uses_gtk == 1', { | |
| 155 'dependencies': [ | |
| 156 '../build/linux/system.gyp:gtk', | |
| 157 ], | |
| 158 }, { | |
| 159 'sources!': [ | |
| 160 'browser/notifications/desktop_notifications_unittest.cc', | |
| 161 'browser/notifications/desktop_notifications_unittest.h', | |
| 162 'browser/notifications/notification_browsertest.cc', | |
| 163 ] | |
| 164 }], | |
| 165 ['OS=="linux" and use_aura==1', { | 154 ['OS=="linux" and use_aura==1', { |
| 166 # TODO(gbillock): aura linux does not support the automation for | 155 # TODO(gbillock): aura linux does not support the automation for |
| 167 # SendMouseMoveNotifyWhenDone | 156 # SendMouseMoveNotifyWhenDone |
| 168 'sources!': [ | 157 'sources!': [ |
| 169 'browser/ui/views/toolbar/toolbar_button_test.cc', | 158 'browser/ui/views/toolbar/toolbar_button_test.cc', |
| 170 ], | 159 ], |
| 171 }], | 160 }], |
| 172 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 161 ['OS=="linux"', { |
| 173 'dependencies': [ | 162 'dependencies': [ |
| 174 '../build/linux/system.gyp:ssl', | 163 '../build/linux/system.gyp:ssl', |
| 175 ], | 164 ], |
| 176 }], | 165 }], |
| 177 ['OS=="linux" and chromeos==0', { | 166 ['OS=="linux" and chromeos==0', { |
| 178 'sources!': [ | 167 'sources!': [ |
| 179 # TODO(port): Disable all the interactive panel tests on all linux | 168 # TODO(port): Disable all the interactive panel tests on all linux |
| 180 # platforms. These are badly busted on linux_aura, also time out | 169 # platforms. These are badly busted on linux_aura, also time out |
| 181 # when run under openbox. | 170 # when run under openbox. |
| 182 # | 171 # |
| (...skipping 1601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1784 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes
t.cc', | 1773 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes
t.cc', |
| 1785 ], | 1774 ], |
| 1786 }, { # else: OS != "win" | 1775 }, { # else: OS != "win" |
| 1787 'sources!': [ | 1776 'sources!': [ |
| 1788 'app/chrome_command_ids.h', | 1777 'app/chrome_command_ids.h', |
| 1789 'app/chrome_dll.rc', | 1778 'app/chrome_dll.rc', |
| 1790 'app/chrome_dll_resource.h', | 1779 'app/chrome_dll_resource.h', |
| 1791 'app/chrome_version.rc.version', | 1780 'app/chrome_version.rc.version', |
| 1792 ], | 1781 ], |
| 1793 }], | 1782 }], |
| 1794 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 1783 ['OS=="linux"', { |
| 1795 'dependencies': [ | 1784 'dependencies': [ |
| 1796 '../build/linux/system.gyp:ssl', | 1785 '../build/linux/system.gyp:ssl', |
| 1797 ], | 1786 ], |
| 1798 }], | 1787 }], |
| 1799 ['OS=="mac"', { | 1788 ['OS=="mac"', { |
| 1800 # TODO(mark): We really want this for all non-static library | 1789 # TODO(mark): We really want this for all non-static library |
| 1801 # targets, but when we tried to pull it up to the common.gypi | 1790 # targets, but when we tried to pull it up to the common.gypi |
| 1802 # level, it broke other things like the ui and startup tests. *shrug* | 1791 # level, it broke other things like the ui and startup tests. *shrug* |
| 1803 'xcode_settings': { | 1792 'xcode_settings': { |
| 1804 'OTHER_LDFLAGS': [ | 1793 'OTHER_LDFLAGS': [ |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2086 'app/chrome_dll.rc', | 2075 'app/chrome_dll.rc', |
| 2087 'app/chrome_dll_resource.h', | 2076 'app/chrome_dll_resource.h', |
| 2088 'app/chrome_version.rc.version', | 2077 'app/chrome_version.rc.version', |
| 2089 ], | 2078 ], |
| 2090 }], | 2079 }], |
| 2091 ['use_x11==1', { | 2080 ['use_x11==1', { |
| 2092 'dependencies': [ | 2081 'dependencies': [ |
| 2093 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2082 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2094 ], | 2083 ], |
| 2095 }], | 2084 }], |
| 2096 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2085 ['OS=="linux"', { |
| 2097 'dependencies': [ | 2086 'dependencies': [ |
| 2098 '../build/linux/system.gyp:ssl', | 2087 '../build/linux/system.gyp:ssl', |
| 2099 ], | 2088 ], |
| 2100 }], | 2089 }], |
| 2101 ['OS=="mac"', { | 2090 ['OS=="mac"', { |
| 2102 # TODO(mark): We really want this for all non-static library | 2091 # TODO(mark): We really want this for all non-static library |
| 2103 # targets, but when we tried to pull it up to the common.gypi | 2092 # targets, but when we tried to pull it up to the common.gypi |
| 2104 # level, it broke other things like the ui and startup tests. *shrug* | 2093 # level, it broke other things like the ui and startup tests. *shrug* |
| 2105 'xcode_settings': { | 2094 'xcode_settings': { |
| 2106 'OTHER_LDFLAGS': [ | 2095 'OTHER_LDFLAGS': [ |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2311 'browser/sync/test/integration/two_client_extension_settings_and_app_set
tings_sync_test.cc', | 2300 'browser/sync/test/integration/two_client_extension_settings_and_app_set
tings_sync_test.cc', |
| 2312 'browser/sync/test/integration/two_client_extensions_sync_test.cc', | 2301 'browser/sync/test/integration/two_client_extensions_sync_test.cc', |
| 2313 'browser/sync/test/integration/two_client_passwords_sync_test.cc', | 2302 'browser/sync/test/integration/two_client_passwords_sync_test.cc', |
| 2314 'browser/sync/test/integration/two_client_preferences_sync_test.cc', | 2303 'browser/sync/test/integration/two_client_preferences_sync_test.cc', |
| 2315 'browser/sync/test/integration/two_client_search_engines_sync_test.cc', | 2304 'browser/sync/test/integration/two_client_search_engines_sync_test.cc', |
| 2316 'browser/sync/test/integration/two_client_sessions_sync_test.cc', | 2305 'browser/sync/test/integration/two_client_sessions_sync_test.cc', |
| 2317 'browser/sync/test/integration/two_client_themes_sync_test.cc', | 2306 'browser/sync/test/integration/two_client_themes_sync_test.cc', |
| 2318 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', | 2307 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', |
| 2319 ], | 2308 ], |
| 2320 'conditions': [ | 2309 'conditions': [ |
| 2321 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2310 ['OS=="linux"', { |
| 2322 'dependencies': [ | 2311 'dependencies': [ |
| 2323 '../build/linux/system.gyp:ssl', | 2312 '../build/linux/system.gyp:ssl', |
| 2324 ], | 2313 ], |
| 2325 }], | 2314 }], |
| 2326 ['OS=="mac"', { | 2315 ['OS=="mac"', { |
| 2327 # The sync_integration_tests do not run on mac without this flag. | 2316 # The sync_integration_tests do not run on mac without this flag. |
| 2328 # Search for comments about "xcode_settings" elsewhere in this file. | 2317 # Search for comments about "xcode_settings" elsewhere in this file. |
| 2329 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 2318 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 2330 # Dictionary sync is disabled on Mac. | 2319 # Dictionary sync is disabled on Mac. |
| 2331 'sources!': [ | 2320 'sources!': [ |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2416 'browser/sync/test/integration/performance/extensions_sync_perf_test.cc'
, | 2405 'browser/sync/test/integration/performance/extensions_sync_perf_test.cc'
, |
| 2417 'browser/sync/test/integration/performance/sync_timing_helper.cc', | 2406 'browser/sync/test/integration/performance/sync_timing_helper.cc', |
| 2418 'browser/sync/test/integration/performance/sync_timing_helper.h', | 2407 'browser/sync/test/integration/performance/sync_timing_helper.h', |
| 2419 'browser/sync/test/integration/performance/passwords_sync_perf_test.cc', | 2408 'browser/sync/test/integration/performance/passwords_sync_perf_test.cc', |
| 2420 'browser/sync/test/integration/performance/sessions_sync_perf_test.cc', | 2409 'browser/sync/test/integration/performance/sessions_sync_perf_test.cc', |
| 2421 'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc'
, | 2410 'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc'
, |
| 2422 'test/base/browser_perf_tests_main.cc', | 2411 'test/base/browser_perf_tests_main.cc', |
| 2423 'test/data/resource.rc', | 2412 'test/data/resource.rc', |
| 2424 ], | 2413 ], |
| 2425 'conditions': [ | 2414 'conditions': [ |
| 2426 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)'
, { | 2415 ['OS=="linux"', { |
| 2427 'dependencies': [ | 2416 'dependencies': [ |
| 2428 '../build/linux/system.gyp:ssl', | 2417 '../build/linux/system.gyp:ssl', |
| 2429 ], | 2418 ], |
| 2430 }], | 2419 }], |
| 2431 ['OS=="mac"', { | 2420 ['OS=="mac"', { |
| 2432 # The sync_performance_tests do not run on mac without this flag. | 2421 # The sync_performance_tests do not run on mac without this flag. |
| 2433 # Search for comments about "xcode_settings" elsewhere in this file. | 2422 # Search for comments about "xcode_settings" elsewhere in this file. |
| 2434 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 2423 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 2435 # Dictionary sync is disabled on Mac. | 2424 # Dictionary sync is disabled on Mac. |
| 2436 'sources!': [ | 2425 'sources!': [ |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2920 ['enable_webrtc==1', { | 2909 ['enable_webrtc==1', { |
| 2921 'dependencies': [ | 2910 'dependencies': [ |
| 2922 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 2911 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 2923 ] | 2912 ] |
| 2924 }], | 2913 }], |
| 2925 ], | 2914 ], |
| 2926 }] | 2915 }] |
| 2927 }], | 2916 }], |
| 2928 ], # 'conditions' | 2917 ], # 'conditions' |
| 2929 } | 2918 } |
| OLD | NEW |