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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
9 import("//build/module_args/v8.gni") | 9 import("//build/module_args/v8.gni") |
10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
898 # targets, but when we tried to pull it up to the common.gypi | 898 # targets, but when we tried to pull it up to the common.gypi |
899 # level, it broke other things like the ui and startup tests. *shrug* | 899 # level, it broke other things like the ui and startup tests. *shrug* |
900 ldflags = [ "-Wl,-ObjC" ] | 900 ldflags = [ "-Wl,-ObjC" ] |
901 | 901 |
902 # Other platforms only need | 902 # Other platforms only need |
903 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 903 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
904 # and can build this target standalone much faster. | 904 # and can build this target standalone much faster. |
905 deps += [ | 905 deps += [ |
906 #'app_mode_app_support', TODO(GYP) | 906 #'app_mode_app_support', TODO(GYP) |
907 "//chrome", | 907 "//chrome", |
908 | |
please use gerrit instead
2015/07/10 00:20:55
Please do not add this newline.
dylanking
2015/07/10 02:21:23
This was added by a formatting tool that presubmit
| |
908 #'../components/components.gyp:breakpad_stubs', TODO(GYP) | 909 #'../components/components.gyp:breakpad_stubs', TODO(GYP) |
909 "//third_party/ocmock", | 910 "//third_party/ocmock", |
910 ] | 911 ] |
911 sources += [ | 912 sources += [ |
912 "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc" , | 913 "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc" , |
913 "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swi per_browsertest.mm", | 914 "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swi per_browsertest.mm", |
914 "../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc", | 915 "../browser/spellchecker/spellcheck_message_filter_platform_mac_browsert est.cc", |
915 ] | 916 ] |
916 sources -= [ | 917 sources -= [ |
917 # TODO(groby): This test depends on hunspell and we cannot run it on | 918 # TODO(groby): This test depends on hunspell and we cannot run it on |
918 # Mac, which does not use hunspell by default. | 919 # Mac, which does not use hunspell by default. |
919 "../browser/spellchecker/spellcheck_service_browsertest.cc", | 920 "../browser/spellchecker/spellcheck_service_browsertest.cc", |
920 | 921 |
921 # TODO(rouslan): This test depends on the custom dictionary UI, | 922 # TODO(rouslan): This test depends on the custom dictionary UI, |
922 # which is disabled on Mac. | 923 # which is disabled on Mac. |
923 # TODO(GYP): This should be added somewhere first ... | 924 # TODO(GYP): This should be added somewhere first ... |
924 # "../browser/ui/webui/options/edit_dictionary_browsertest.js", | 925 # "../browser/ui/webui/options/edit_dictionary_browsertest.js", |
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1829 "//third_party/mojo/src/mojo/edk/system", | 1830 "//third_party/mojo/src/mojo/edk/system", |
1830 ] | 1831 ] |
1831 | 1832 |
1832 if (!is_android && use_ash) { | 1833 if (!is_android && use_ash) { |
1833 sources += | 1834 sources += |
1834 rebase_path(unit_gypi_values.chrome_test_support_unit_ash_sources, | 1835 rebase_path(unit_gypi_values.chrome_test_support_unit_ash_sources, |
1835 ".", | 1836 ".", |
1836 "//chrome") | 1837 "//chrome") |
1837 } | 1838 } |
1838 } | 1839 } |
OLD | NEW |