OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
8 import("//build/module_args/v8.gni") | 8 import("//build/module_args/v8.gni") |
9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
10 | 10 |
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 sources += [ "$root_gen_dir/chrome/other_version.rc" ] | 373 sources += [ "$root_gen_dir/chrome/other_version.rc" ] |
374 deps += [ | 374 deps += [ |
375 "//chrome:chrome_version_resources", | 375 "//chrome:chrome_version_resources", |
376 "//third_party/isimpledom", | 376 "//third_party/isimpledom", |
377 "//third_party/wtl", | 377 "//third_party/wtl", |
378 "//ui/resources", | 378 "//ui/resources", |
379 ] | 379 ] |
380 } | 380 } |
381 | 381 |
382 if (is_mac) { | 382 if (is_mac) { |
383 datadeps = [ | 383 datadeps += [ "//chrome" ] |
384 "//chrome", | |
385 ] | |
386 | 384 |
387 # TODO(mark): We really want this for all non-static library targets, but | 385 # TODO(mark): We really want this for all non-static library targets, but |
388 # when we tried to pull it up to the common.gypi level, it broke other | 386 # when we tried to pull it up to the common.gypi level, it broke other |
389 # things like the ui and startup tests. *shrug* | 387 # things like the ui and startup tests. *shrug* |
390 ldflags += [ "-Wl,-ObjC" ] | 388 ldflags += [ "-Wl,-ObjC" ] |
391 } | 389 } |
392 | 390 |
393 if (cld_version == 0 || cld_version == 2) { | 391 if (cld_version == 0 || cld_version == 2) { |
394 # Interactive tests should use whatever CLD2 data access mode that the | 392 # Interactive tests should use whatever CLD2 data access mode that the |
395 # application embedder is using. | 393 # application embedder is using. |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 871 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
874 # and can build this target standalone much faster. | 872 # and can build this target standalone much faster. |
875 deps += [ | 873 deps += [ |
876 #'app_mode_app_support', TODO(GYP) | 874 #'app_mode_app_support', TODO(GYP) |
877 "//chrome", | 875 "//chrome", |
878 #'../components/components.gyp:breakpad_stubs', TODO(GYP) | 876 #'../components/components.gyp:breakpad_stubs', TODO(GYP) |
879 #'../third_party/ocmock/ocmock.gyp:ocmock', TODO(GYP) | 877 #'../third_party/ocmock/ocmock.gyp:ocmock', TODO(GYP) |
880 ] | 878 ] |
881 sources += [ | 879 sources += [ |
882 "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc"
, | 880 "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc"
, |
883 "../browser/renderer_host/chrome_render_widget_host_view_mac_delegate_br
owsertest.cc", | |
884 "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swi
per_browsertest.mm", | 881 "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swi
per_browsertest.mm", |
885 "../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc", | 882 "../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc", |
886 ] | 883 ] |
887 sources -= [ | 884 sources -= [ |
888 # TODO(groby): This test depends on hunspell and we cannot run it on | 885 # TODO(groby): This test depends on hunspell and we cannot run it on |
889 # Mac, which does not use hunspell by default. | 886 # Mac, which does not use hunspell by default. |
890 "../browser/spellchecker/spellcheck_service_browsertest.cc", | 887 "../browser/spellchecker/spellcheck_service_browsertest.cc", |
891 | 888 |
892 # TODO(rouslan): This test depends on the custom dictionary UI, | 889 # TODO(rouslan): This test depends on the custom dictionary UI, |
893 # which is disabled on Mac. | 890 # which is disabled on Mac. |
894 "../browser/ui/webui/options/edit_dictionary_browsertest.js", | 891 # TODO(GYP): This should be added somewhere first ... |
| 892 # "../browser/ui/webui/options/edit_dictionary_browsertest.js", |
895 | 893 |
896 # TODO(rouslan): This test depends on hunspell and we cannot run it | 894 # TODO(rouslan): This test depends on hunspell and we cannot run it |
897 # on Mac, which does use hunspell by default. | 895 # on Mac, which does use hunspell by default. |
898 "../browser/ui/webui/options/language_options_dictionary_download_browse
rtest.js", | 896 # TODO(GYP): This should be added somewhere first ... |
| 897 # "../browser/ui/webui/options/language_options_dictionary_download_brow
sertest.js", |
899 | 898 |
900 # ProcessSingletonMac doesn"t do anything. | 899 # ProcessSingletonMac doesn"t do anything. |
901 "../browser/process_singleton_browsertest.cc", | 900 "../browser/process_singleton_browsertest.cc", |
902 | 901 |
903 # This test depends on GetCommandLineForRelaunch, which is not | 902 # This test depends on GetCommandLineForRelaunch, which is not |
904 # available on Mac. | 903 # available on Mac. |
905 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, | 904 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, |
906 | 905 |
907 # single-process mode hangs on Mac sometimes because of multiple UI | 906 # single-process mode hangs on Mac sometimes because of multiple UI |
908 # message loops. See 306348 | 907 # message loops. See 306348 |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1545 sources -= [ | 1544 sources -= [ |
1546 "../browser/ui/tests/ui_gfx_image_unittest.cc", | 1545 "../browser/ui/tests/ui_gfx_image_unittest.cc", |
1547 "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc", | 1546 "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc", |
1548 "../tools/convert_dict/convert_dict_unittest.cc", | 1547 "../tools/convert_dict/convert_dict_unittest.cc", |
1549 ] | 1548 ] |
1550 | 1549 |
1551 # The test fetches resources which means Mac need the app bundle to exist | 1550 # The test fetches resources which means Mac need the app bundle to exist |
1552 # on disk so it can pull from it. | 1551 # on disk so it can pull from it. |
1553 deps += [ | 1552 deps += [ |
1554 "//third_party/google_toolbox_for_mac", | 1553 "//third_party/google_toolbox_for_mac", |
1555 "//third_party/ocmock", | 1554 # "//third_party/ocmock", # TODO(GYP) |
1556 ] | 1555 ] |
1557 | 1556 |
1558 # TODO(mark): We really want this for all non-static library targets, | 1557 # TODO(mark): We really want this for all non-static library targets, |
1559 # but when we tried to pull it up to the common.gypi level, it broke | 1558 # but when we tried to pull it up to the common.gypi level, it broke |
1560 # other things like the ui and startup tests. *shrug* | 1559 # other things like the ui and startup tests. *shrug* |
1561 ldflags = [ "-Wl,-ObjC" ] | 1560 ldflags = [ "-Wl,-ObjC" ] |
1562 } | 1561 } |
1563 if (!is_mac && !is_ios) { | 1562 if (!is_mac && !is_ios) { |
1564 deps += [ | 1563 deps += [ |
1565 "//third_party/hunspell", | 1564 "//third_party/hunspell", |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1669 } | 1668 } |
1670 if (use_ozone) { | 1669 if (use_ozone) { |
1671 # crbug.com/354036 | 1670 # crbug.com/354036 |
1672 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] | 1671 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] |
1673 } | 1672 } |
1674 if (!enable_plugin_installation) { | 1673 if (!enable_plugin_installation) { |
1675 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] | 1674 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] |
1676 } | 1675 } |
1677 } | 1676 } |
1678 } | 1677 } |
OLD | NEW |