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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 551070: Revert 36541 (which went in without any commit log by some black magic). ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 11 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
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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/find_bar_host_browsertest.cc', 9 'browser/views/find_bar_host_browsertest.cc',
10 ], 10 ],
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 '../app/app.gyp:app_resources', 485 '../app/app.gyp:app_resources',
486 '../ipc/ipc.gyp:ipc', 486 '../ipc/ipc.gyp:ipc',
487 '../net/net.gyp:net_resources', 487 '../net/net.gyp:net_resources',
488 '../net/net.gyp:net_test_support', 488 '../net/net.gyp:net_test_support',
489 '../printing/printing.gyp:printing', 489 '../printing/printing.gyp:printing',
490 '../webkit/webkit.gyp:webkit_resources', 490 '../webkit/webkit.gyp:webkit_resources',
491 '../skia/skia.gyp:skia', 491 '../skia/skia.gyp:skia',
492 '../testing/gmock.gyp:gmock', 492 '../testing/gmock.gyp:gmock',
493 '../testing/gtest.gyp:gtest', 493 '../testing/gtest.gyp:gtest',
494 '../third_party/bzip2/bzip2.gyp:bzip2', 494 '../third_party/bzip2/bzip2.gyp:bzip2',
495 '../third_party/cld/cld.gyp:cld',
496 '../third_party/icu/icu.gyp:icui18n', 495 '../third_party/icu/icu.gyp:icui18n',
497 '../third_party/icu/icu.gyp:icuuc', 496 '../third_party/icu/icu.gyp:icuuc',
498 '../third_party/libxml/libxml.gyp:libxml', 497 '../third_party/libxml/libxml.gyp:libxml',
499 '../third_party/npapi/npapi.gyp:npapi', 498 '../third_party/npapi/npapi.gyp:npapi',
500 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', 499 '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
501 ], 500 ],
502 'include_dirs': [ 501 'include_dirs': [
503 '..', 502 '..',
504 '../third_party/cld', 503 '../third_party/cld',
505 ], 504 ],
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 'dependencies': [ 889 'dependencies': [
891 '../build/linux/system.gyp:gtk', 890 '../build/linux/system.gyp:gtk',
892 '../build/linux/system.gyp:nss', 891 '../build/linux/system.gyp:nss',
893 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 892 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
894 ], 893 ],
895 'sources': [ 894 'sources': [
896 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', 895 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
897 ], 896 ],
898 'sources!': [ 897 'sources!': [
899 'browser/views/bookmark_context_menu_test.cc', 898 'browser/views/bookmark_context_menu_test.cc',
899 # Compact Language Detection (cld) is not supported in linux yet.
900 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/ compact_lang_det_unittest_small.cc',
900 ], 901 ],
901 }], 902 }],
902 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { 903 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
903 'dependencies': [ 904 'dependencies': [
904 '../views/views.gyp:views', 905 '../views/views.gyp:views',
905 ], 906 ],
906 'sources': [ 907 'sources': [
907 '<@(views_unit_tests_sources)', 908 '<@(views_unit_tests_sources)',
908 ], 909 ],
909 # We must use 'sources/' instead of 'source!' as there is a 910 # We must use 'sources/' instead of 'source!' as there is a
(...skipping 29 matching lines...) Expand all
939 '../third_party/GTM/AppKit', 940 '../third_party/GTM/AppKit',
940 ], 941 ],
941 'sources!': [ 942 'sources!': [
942 'browser/views/bookmark_context_menu_test.cc', 943 'browser/views/bookmark_context_menu_test.cc',
943 'browser/back_forward_menu_model_unittest.cc', 944 'browser/back_forward_menu_model_unittest.cc',
944 'browser/gtk/go_button_gtk_unittest.cc', 945 'browser/gtk/go_button_gtk_unittest.cc',
945 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', 946 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
946 'browser/tab_contents/navigation_controller_unittest.cc', 947 'browser/tab_contents/navigation_controller_unittest.cc',
947 'browser/task_manager_unittest.cc', 948 'browser/task_manager_unittest.cc',
948 '../third_party/hunspell/google/hunspell_tests.cc', 949 '../third_party/hunspell/google/hunspell_tests.cc',
950
951 # Compact Language Detection (cld) is not supported in mac yet.
952 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/ compact_lang_det_unittest_small.cc',
949 ], 953 ],
950 # TODO(mark): We really want this for all non-static library targets, 954 # TODO(mark): We really want this for all non-static library targets,
951 # but when we tried to pull it up to the common.gypi level, it broke 955 # but when we tried to pull it up to the common.gypi level, it broke
952 # other things like the ui, startup, and page_cycler tests. *shrug* 956 # other things like the ui, startup, and page_cycler tests. *shrug*
953 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 957 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
954 }, { # OS != "mac" 958 }, { # OS != "mac"
955 'dependencies': [ 959 'dependencies': [
956 'convert_dict_lib', 960 'convert_dict_lib',
957 '../third_party/hunspell/hunspell.gyp:hunspell', 961 '../third_party/hunspell/hunspell.gyp:hunspell',
958 ], 962 ],
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1860 ] 1864 ]
1861 }], # 'coverage!=0' 1865 }], # 'coverage!=0'
1862 ], # 'conditions' 1866 ], # 'conditions'
1863 } 1867 }
1864 1868
1865 # Local Variables: 1869 # Local Variables:
1866 # tab-width:2 1870 # tab-width:2
1867 # indent-tabs-mode:nil 1871 # indent-tabs-mode:nil
1868 # End: 1872 # End:
1869 # vim: set expandtab tabstop=2 shiftwidth=2: 1873 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/extensions/extension_api_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698