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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 12213044: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Depend on xdisplaycheck when use_x11==1, not when toolkit_uses_gtk==1 Created 7 years, 10 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_tests.gypi ('k') | ui/ui_unittests.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 5 'targets': [
6 { 6 {
7 # This target contains mocks and test utilities that don't belong in 7 # This target contains mocks and test utilities that don't belong in
8 # production libraries but are used by more than one test executable. 8 # production libraries but are used by more than one test executable.
9 'target_name': 'test_support_common', 9 'target_name': 'test_support_common',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 1901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1912 'browser/policy/auto_enrollment_client_unittest.cc' , 1912 'browser/policy/auto_enrollment_client_unittest.cc' ,
1913 'browser/policy/cros_user_policy_cache_unittest.cc', 1913 'browser/policy/cros_user_policy_cache_unittest.cc',
1914 'browser/policy/device_policy_cache_unittest.cc', 1914 'browser/policy/device_policy_cache_unittest.cc',
1915 'browser/policy/device_local_account_policy_service_unittest.cc', 1915 'browser/policy/device_local_account_policy_service_unittest.cc',
1916 'browser/policy/device_status_collector_unittest.cc', 1916 'browser/policy/device_status_collector_unittest.cc',
1917 'browser/policy/enterprise_install_attributes_unittest.cc', 1917 'browser/policy/enterprise_install_attributes_unittest.cc',
1918 'browser/policy/network_configuration_updater_unittest.cc', 1918 'browser/policy/network_configuration_updater_unittest.cc',
1919 'browser/policy/proxy_policy_provider_unittest.cc', 1919 'browser/policy/proxy_policy_provider_unittest.cc',
1920 ], 1920 ],
1921 }], 1921 }],
1922 ['use_x11==1', {
1923 'dependencies': [
1924 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1925 ],
1926 }],
1922 ['toolkit_uses_gtk == 1', { 1927 ['toolkit_uses_gtk == 1', {
1923 'conditions': [ 1928 'conditions': [
1924 ['selinux==0', { 1929 ['selinux==0', {
1925 'dependencies': [ 1930 'dependencies': [
1926 '../sandbox/sandbox.gyp:*', 1931 '../sandbox/sandbox.gyp:*',
1927 ], 1932 ],
1928 }], 1933 }],
1929 ['toolkit_views==1', { 1934 ['toolkit_views==1', {
1930 'sources!': [ 1935 'sources!': [
1931 'browser/ui/gtk/accelerators_gtk_unittest.cc', 1936 'browser/ui/gtk/accelerators_gtk_unittest.cc',
(...skipping 14 matching lines...) Expand all
1946 '../build/linux/system.gyp:gnome_keyring_direct', 1951 '../build/linux/system.gyp:gnome_keyring_direct',
1947 ], 1952 ],
1948 }], 1953 }],
1949 ], 1954 ],
1950 }], 1955 }],
1951 ], 1956 ],
1952 'dependencies': [ 1957 'dependencies': [
1953 '../build/linux/system.gyp:dbus', 1958 '../build/linux/system.gyp:dbus',
1954 '../build/linux/system.gyp:gtk', 1959 '../build/linux/system.gyp:gtk',
1955 '../dbus/dbus.gyp:dbus_test_support', 1960 '../dbus/dbus.gyp:dbus_test_support',
1956 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1957 ], 1961 ],
1958 'sources!': [ 1962 'sources!': [
1959 'browser/printing/print_job_unittest.cc', 1963 'browser/printing/print_job_unittest.cc',
1960 ], 1964 ],
1961 }, { # else: toolkit_uses_gtk != 1 1965 }, { # else: toolkit_uses_gtk != 1
1962 'sources!': [ 1966 'sources!': [
1963 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', 1967 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
1964 '../ui/views/focus/accelerator_handler_gtk_unittest.cc', 1968 '../ui/views/focus/accelerator_handler_gtk_unittest.cc',
1965 ], 1969 ],
1966 }], 1970 }],
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
2382 # more details. 2386 # more details.
2383 'DebugInformationFormat': '3', 2387 'DebugInformationFormat': '3',
2384 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb', 2388 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
2385 }, 2389 },
2386 }, 2390 },
2387 }, 2391 },
2388 ], 2392 ],
2389 }], 2393 }],
2390 ], # 'conditions' 2394 ], # 'conditions'
2391 } 2395 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698