| 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 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 872 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 870 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
| 873 # and can build this target standalone much faster. | 871 # and can build this target standalone much faster. |
| 874 deps += [ | 872 deps += [ |
| 875 #'app_mode_app_support', TODO(GYP) | 873 #'app_mode_app_support', TODO(GYP) |
| 876 "//chrome", | 874 "//chrome", |
| 877 #'../components/components.gyp:breakpad_stubs', TODO(GYP) | 875 #'../components/components.gyp:breakpad_stubs', TODO(GYP) |
| 878 #'../third_party/ocmock/ocmock.gyp:ocmock', TODO(GYP) | 876 #'../third_party/ocmock/ocmock.gyp:ocmock', TODO(GYP) |
| 879 ] | 877 ] |
| 880 sources += [ | 878 sources += [ |
| 881 "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc"
, | 879 "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc"
, |
| 882 "../browser/renderer_host/chrome_render_widget_host_view_mac_delegate_br
owsertest.cc", | |
| 883 "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swi
per_browsertest.mm", | 880 "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swi
per_browsertest.mm", |
| 884 "../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc", | 881 "../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc", |
| 885 ] | 882 ] |
| 886 sources -= [ | 883 sources -= [ |
| 887 # TODO(groby): This test depends on hunspell and we cannot run it on | 884 # TODO(groby): This test depends on hunspell and we cannot run it on |
| 888 # Mac, which does not use hunspell by default. | 885 # Mac, which does not use hunspell by default. |
| 889 "../browser/spellchecker/spellcheck_service_browsertest.cc", | 886 "../browser/spellchecker/spellcheck_service_browsertest.cc", |
| 890 | 887 |
| 891 # TODO(rouslan): This test depends on the custom dictionary UI, | 888 # TODO(rouslan): This test depends on the custom dictionary UI, |
| 892 # which is disabled on Mac. | 889 # which is disabled on Mac. |
| 893 "../browser/ui/webui/options/edit_dictionary_browsertest.js", | 890 # TODO(GYP): This should be added somewhere first ... |
| 891 # "../browser/ui/webui/options/edit_dictionary_browsertest.js", |
| 894 | 892 |
| 895 # TODO(rouslan): This test depends on hunspell and we cannot run it | 893 # TODO(rouslan): This test depends on hunspell and we cannot run it |
| 896 # on Mac, which does use hunspell by default. | 894 # on Mac, which does use hunspell by default. |
| 897 "../browser/ui/webui/options/language_options_dictionary_download_browse
rtest.js", | 895 # TODO(GYP): This should be added somewhere first ... |
| 896 # "../browser/ui/webui/options/language_options_dictionary_download_brow
sertest.js", |
| 898 | 897 |
| 899 # ProcessSingletonMac doesn"t do anything. | 898 # ProcessSingletonMac doesn"t do anything. |
| 900 "../browser/process_singleton_browsertest.cc", | 899 "../browser/process_singleton_browsertest.cc", |
| 901 | 900 |
| 902 # This test depends on GetCommandLineForRelaunch, which is not | 901 # This test depends on GetCommandLineForRelaunch, which is not |
| 903 # available on Mac. | 902 # available on Mac. |
| 904 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, | 903 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, |
| 905 | 904 |
| 906 # single-process mode hangs on Mac sometimes because of multiple UI | 905 # single-process mode hangs on Mac sometimes because of multiple UI |
| 907 # message loops. See 306348 | 906 # message loops. See 306348 |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1544 sources -= [ | 1543 sources -= [ |
| 1545 "../browser/ui/tests/ui_gfx_image_unittest.cc", | 1544 "../browser/ui/tests/ui_gfx_image_unittest.cc", |
| 1546 "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc", | 1545 "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc", |
| 1547 "../tools/convert_dict/convert_dict_unittest.cc", | 1546 "../tools/convert_dict/convert_dict_unittest.cc", |
| 1548 ] | 1547 ] |
| 1549 | 1548 |
| 1550 # The test fetches resources which means Mac need the app bundle to exist | 1549 # The test fetches resources which means Mac need the app bundle to exist |
| 1551 # on disk so it can pull from it. | 1550 # on disk so it can pull from it. |
| 1552 deps += [ | 1551 deps += [ |
| 1553 "//third_party/google_toolbox_for_mac", | 1552 "//third_party/google_toolbox_for_mac", |
| 1554 "//third_party/ocmock", | 1553 # "//third_party/ocmock", # TODO(GYP) |
| 1555 ] | 1554 ] |
| 1556 | 1555 |
| 1557 # TODO(mark): We really want this for all non-static library targets, | 1556 # TODO(mark): We really want this for all non-static library targets, |
| 1558 # but when we tried to pull it up to the common.gypi level, it broke | 1557 # but when we tried to pull it up to the common.gypi level, it broke |
| 1559 # other things like the ui and startup tests. *shrug* | 1558 # other things like the ui and startup tests. *shrug* |
| 1560 ldflags = [ "-Wl,-ObjC" ] | 1559 ldflags = [ "-Wl,-ObjC" ] |
| 1561 } | 1560 } |
| 1562 if (!is_mac && !is_ios) { | 1561 if (!is_mac && !is_ios) { |
| 1563 deps += [ | 1562 deps += [ |
| 1564 "//third_party/hunspell", | 1563 "//third_party/hunspell", |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1668 } | 1667 } |
| 1669 if (use_ozone) { | 1668 if (use_ozone) { |
| 1670 # crbug.com/354036 | 1669 # crbug.com/354036 |
| 1671 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] | 1670 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] |
| 1672 } | 1671 } |
| 1673 if (!enable_plugin_installation) { | 1672 if (!enable_plugin_installation) { |
| 1674 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] | 1673 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] |
| 1675 } | 1674 } |
| 1676 } | 1675 } |
| 1677 } | 1676 } |
| OLD | NEW |