diff options
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/BUILD.gn | 8 | ||||
-rw-r--r-- | chrome/android/BUILD.gn | 16 | ||||
-rw-r--r-- | chrome/app_shim/BUILD.gn | 2 | ||||
-rw-r--r-- | chrome/browser/BUILD.gn | 16 | ||||
-rw-r--r-- | chrome/browser/chromeos/BUILD.gn | 22 | ||||
-rw-r--r-- | chrome/browser/devtools/BUILD.gn | 6 | ||||
-rw-r--r-- | chrome/browser/extensions/BUILD.gn | 6 | ||||
-rw-r--r-- | chrome/browser/resources/chromeos/chromevox/BUILD.gn | 8 | ||||
-rw-r--r-- | chrome/browser/ui/BUILD.gn | 4 | ||||
-rw-r--r-- | chrome/browser/ui/libgtk2ui/BUILD.gn | 4 | ||||
-rw-r--r-- | chrome/chrome_repack_locales.gni | 2 | ||||
-rw-r--r-- | chrome/chrome_watcher/BUILD.gn | 2 | ||||
-rw-r--r-- | chrome/common/BUILD.gn | 12 | ||||
-rw-r--r-- | chrome/installer/gcapi/BUILD.gn | 2 | ||||
-rw-r--r-- | chrome/installer/test/BUILD.gn | 2 | ||||
-rw-r--r-- | chrome/renderer/BUILD.gn | 6 | ||||
-rw-r--r-- | chrome/service/BUILD.gn | 2 | ||||
-rw-r--r-- | chrome/test/BUILD.gn | 49 | ||||
-rw-r--r-- | chrome/test/android/BUILD.gn | 4 | ||||
-rw-r--r-- | chrome/utility/BUILD.gn | 6 |
20 files changed, 89 insertions, 90 deletions
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index ed18e51..0a09f8e 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -620,9 +620,9 @@ if (is_chrome_branded) { group("packed_resources") { public_deps = [ + ":repack_chrome_100_percent", ":repack_locales_pack", ":repack_pseudo_locales_pack", - ":repack_chrome_100_percent", ] if (is_chrome_branded) { @@ -659,15 +659,15 @@ repack("packed_extra_resources") { "$root_gen_dir/ui/resources/webui_resources.pak", ] deps = [ - "//chrome/browser:resources", "//chrome/app/theme:chrome_unscaled_resources", - "//chrome/common:resources", + "//chrome/browser:resources", "//chrome/browser/resources:invalidations_resources", "//chrome/browser/resources:memory_internals_resources", "//chrome/browser/resources:net_internals_resources", "//chrome/browser/resources:password_manager_internals_resources", "//chrome/browser/resources:signin_internals_resources", "//chrome/browser/resources:translate_internals_resources", + "//chrome/common:resources", "//components/resources", "//net:net_resources", "//ui/resources", @@ -688,8 +688,8 @@ repack("packed_extra_resources") { "//chrome/browser/devtools:webrtc_device_provider_resources", "//chrome/browser/resources:component_extension_resources", "//chrome/browser/resources:options_resources", - "//chrome/browser/resources:settings_resources", "//chrome/browser/resources:quota_internals_resources", + "//chrome/browser/resources:settings_resources", "//chrome/browser/resources:sync_file_system_internals_resources", "//content/browser/devtools:devtools_resources", ] diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 8379c7a..9cef154 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -51,9 +51,9 @@ android_resources("chrome_java_resources") { deps = [ ":chrome_locale_paks", ":chrome_strings_grd", + "//chrome/app:java_strings_grd", "//components/policy:app_restrictions_resources", "//content/public/android:content_java_resources", - "//chrome/app:java_strings_grd", "//third_party/android_data_chart:android_data_chart_java_resources", "//third_party/android_media:android_media_resources", ] @@ -120,7 +120,6 @@ android_library("chrome_java") { ":chrome_java_resources", ":document_tab_model_info_proto_java", "//base:base_java", - "//net/android:net_java", "//components/bookmarks/common/android:bookmarks_java", "//components/dom_distiller/android:dom_distiller_content_java", "//components/dom_distiller/android:dom_distiller_core_java", @@ -136,8 +135,12 @@ android_library("chrome_java") { "//components/web_contents_delegate_android:web_contents_delegate_android_java", "//content/public/android:content_java", "//media/base/android:media_java", + "//media/base/android:media_java", + "//media/midi:midi_java", + "//net/android:net_java", "//printing:printing_java", "//sync/android:sync_java", + "//third_party/WebKit/public:blink_headers_java", "//third_party/android_data_chart:android_data_chart_java", "//third_party/android_media:android_media_java", "//third_party/android_protobuf:protobuf_nano_javalib", @@ -152,9 +155,6 @@ android_library("chrome_java") { "//third_party/cacheinvalidation:cacheinvalidation_proto_java", "//third_party/gif_player:gif_player_java", "//third_party/jsr-305:jsr_305_javalib", - "//third_party/WebKit/public:blink_headers_java", - "//media/base/android:media_java", - "//media/midi:midi_java", "//ui/android:ui_java", "//ui/android:ui_java_resources", google_play_services_library, @@ -257,9 +257,9 @@ junit_binary("chrome_junit_tests") { "//components/invalidation/impl:java", "//sync:sync_java_test_support", "//sync/android:sync_java", + "//third_party/android_tools:android_support_v7_mediarouter_java", "//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/junit:hamcrest", - "//third_party/android_tools:android_support_v7_mediarouter_java", google_play_services_library, ] } @@ -322,12 +322,12 @@ android_library("chrome_shared_test_java") { "//net/android:net_java", "//net/android:net_java_test_support", "//printing:printing_java", + "//sync:sync_java_test_support", "//sync/android:sync_java", "//sync/android:sync_javatests", - "//sync:sync_java_test_support", + "//third_party/android_tools:android_support_v13_java", "//third_party/android_tools:android_support_v7_appcompat_java", "//third_party/android_tools:android_support_v7_recyclerview_java", - "//third_party/android_tools:android_support_v13_java", "//third_party/android_tools:legacy_http_javalib", "//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/jsr-305:jsr_305_javalib", diff --git a/chrome/app_shim/BUILD.gn b/chrome/app_shim/BUILD.gn index c4c164b..74bca93 100644 --- a/chrome/app_shim/BUILD.gn +++ b/chrome/app_shim/BUILD.gn @@ -11,7 +11,7 @@ source_set("app_shim") { ] deps = [ - "//chrome/common:app_mode_app_support", "//chrome:strings", + "//chrome/common:app_mode_app_support", ] } diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index e1d05f9..f93e73b 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -137,13 +137,13 @@ source_set("browser") { "//components/metrics:net", "//components/metrics:profiler", "//components/metrics:profiler_content", - "//components/metrics/proto:proto", "//components/metrics:ui", + "//components/metrics/proto:proto", "//components/metrics_services_manager", "//components/mime_util", "//components/navigation_metrics", - "//components/ntp_snippets", "//components/network_time", + "//components/ntp_snippets", "//components/offline_pages", "//components/omnibox/browser", "//components/os_crypt", @@ -180,9 +180,9 @@ source_set("browser") { "//components/variations", "//components/variations/net", "//components/variations/service", + "//components/web_resource", "//components/webdata/common", "//components/webdata_services", - "//components/web_resource", "//content/public/browser", "//content/public/common", "//courgette:courgette_lib", @@ -194,8 +194,8 @@ source_set("browser") { "//sync", "//third_party/cacheinvalidation", "//third_party/icu", - "//third_party/libxml", "//third_party/libjingle", + "//third_party/libxml", "//third_party/widevine/cdm:version_h", "//third_party/zlib", "//third_party/zlib:minizip", @@ -205,9 +205,9 @@ source_set("browser") { "//ui/gfx", "//ui/gfx/geometry", "//ui/message_center", + "//ui/resources", "//ui/shell_dialogs", "//ui/strings", - "//ui/resources", ] data_deps = [] @@ -657,8 +657,8 @@ source_set("browser") { ".", "//chrome") deps += [ - "//printing", "//components/printing/browser", + "//printing", ] if (is_win) { @@ -738,9 +738,9 @@ source_set("browser") { "//third_party/libaddressinput:util", ] deps -= [ - "//third_party/libaddressinput", "//components/storage_monitor", "//components/web_modal", + "//third_party/libaddressinput", ] defines += [ "ENABLE_DATA_REDUCTION_PROXY_DEBUGGING" ] @@ -1079,6 +1079,7 @@ source_set("test_support") { ] deps = [ "//base:prefs_test_support", + "//chrome/app/theme:theme_resources", "//chrome/browser", "//chrome/common", "//chrome/common/safe_browsing:proto", @@ -1089,7 +1090,6 @@ source_set("test_support") { "//components/syncable_prefs:test_support", "//components/user_prefs/tracked:user_prefs_tracked_test_support", "//content/test:test_support", - "//chrome/app/theme:theme_resources", "//net:test_support", "//skia", "//testing/gmock", diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 5c5d3b8..bb24b8d 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -21,11 +21,11 @@ source_set("chromeos") { public_deps = [ "//ash/resources", "//ash/strings", - "//chrome/app/resources:platform_locale_settings", - "//chrome/app/theme:theme_resources", "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", + "//chrome/app/resources:platform_locale_settings", + "//chrome/app/theme:theme_resources", "//components/wallpaper", "//content/app/resources", "//ui/chromeos/resources", @@ -41,12 +41,6 @@ source_set("chromeos") { "//ash", "//ash:ash_with_content", "//build/linux:fontconfig", - "//components/drive", - "//components/flags_ui", - "//components/login", - "//components/session_manager/core", - "//components/user_manager", - "//components/wifi_sync", "//chrome/browser/devtools", "//chrome/browser/extensions", "//chrome/browser/safe_browsing:chunk_proto", @@ -58,17 +52,23 @@ source_set("chromeos") { "//chrome/common/safe_browsing:proto", "//chrome/installer/util", "//chromeos", - "//chromeos/ime:gencode", "//chromeos:cryptohome_proto", "//chromeos:cryptohome_signkey_proto", "//chromeos:power_manager_proto", + "//chromeos/ime:gencode", "//components/certificate_reporting:cert_logger_proto", "//components/certificate_reporting:encrypted_cert_logger_proto", + "//components/drive", + "//components/flags_ui", + "//components/login", "//components/onc", "//components/ownership", "//components/pairing", "//components/policy", "//components/proxy_config", + "//components/session_manager/core", + "//components/user_manager", + "//components/wifi_sync", # This depends directly on the variations target, rather than just # transitively via the common target because the proto sources need to @@ -108,9 +108,9 @@ source_set("chromeos") { "//ui/chromeos:ui_chromeos", "//ui/compositor", "//ui/display", + "//ui/events:dom_keycode_converter", "//ui/events/devices", "//ui/events/platform", - "//ui/events:dom_keycode_converter", "//ui/file_manager", "//ui/message_center", "//ui/surface", @@ -174,8 +174,8 @@ source_set("unit_tests") { ":device_policy_proto", "//ash/resources", "//components/drive", - "//components/policy", "//components/invalidation/public", + "//components/policy", "//components/resources", "//crypto:platform", "//dbus", diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn index 496e553..3088e41 100644 --- a/chrome/browser/devtools/BUILD.gn +++ b/chrome/browser/devtools/BUILD.gn @@ -67,18 +67,18 @@ static_library("devtools") { if (!is_android) { deps += [ - "//chrome/app/theme:theme_resources", - "//chrome/common/extensions/api", + ":webrtc_device_provider_resources", "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", + "//chrome/app/theme:theme_resources", + "//chrome/common/extensions/api", "//components/devtools_http_handler", "//net:http_server", "//skia", "//third_party/icu", "//third_party/leveldatabase", "//third_party/libusb", - ":webrtc_device_provider_resources", ] sources += [ "chrome_devtools_discovery_provider.cc", diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 14208a9..c093041 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -55,13 +55,14 @@ source_set("extensions") { "//crypto", "//device/bluetooth", "//device/hid", + "//extensions:extensions_resources", "//extensions/browser", "//extensions/common/api", "//extensions/common/api:api_registration", "//extensions/strings", - "//extensions:extensions_resources", "//net", "//skia", + "//storage/browser", "//storage/common", "//sync", "//third_party/WebKit/public:image_resources", @@ -80,7 +81,6 @@ source_set("extensions") { "//ui/resources", "//ui/strings", "//url", - "//storage/browser", ] if (is_chromeos) { @@ -91,10 +91,10 @@ source_set("extensions") { sources -= [ "api/music_manager_private/device_id_linux.cc" ] configs += [ "//build/config/linux:dbus" ] deps += [ - "//third_party/protobuf:protobuf_lite", "//chromeos/ime:gencode", "//components/chrome_apps", "//remoting/host/it2me:common", + "//third_party/protobuf:protobuf_lite", ] } else { sources += [ diff --git a/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/chromevox/BUILD.gn index c3bce7e..e2a1693 100644 --- a/chrome/browser/resources/chromeos/chromevox/BUILD.gn +++ b/chrome/browser/resources/chromeos/chromevox/BUILD.gn @@ -26,15 +26,15 @@ group("chromevox") { #<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl' # TODO(GYP) ":chromevox_copied_files", - ":chromevox_manifest", ":chromevox_guest_manifest", + ":chromevox_manifest", ] if (chromevox_compress_js) { deps += [ + ":chromevox_background_script", ":chromevox_content_script", ":chromevox_kbexplorer_script", ":chromevox_options_script", - ":chromevox_background_script", ":chromevox_panel_script", ] } else { @@ -314,6 +314,8 @@ test("chromevox_tests") { sources = chromevox_tests_gypi_values.chromevox_tests_sources deps = [ + ":chromevox_extjs_tests", + ":chromevox_unitjs_tests", "//base", "//base:i18n", "//base/test:test_support", @@ -328,8 +330,6 @@ test("chromevox_tests") { "//chrome/test:test_support_ui", "//testing/gmock", "//testing/gtest", - ":chromevox_extjs_tests", - ":chromevox_unitjs_tests", ] if (cld_version == 0 || cld_version == 2) { # Because the browser_tests use translate, they need CLD data. diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index c945da1..6c1d26a 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -117,8 +117,8 @@ source_set("ui") { "//third_party/WebKit/public:resources", "//third_party/adobe/flash:flapper_version_h", "//third_party/leveldatabase", - "//third_party/mojo/src/mojo/edk/system", "//third_party/libjingle", + "//third_party/mojo/src/mojo/edk/system", "//third_party/re2", "//ui/base/ime", "//ui/compositor", @@ -399,9 +399,9 @@ source_set("ui") { "//chrome/installer/util:strings", "//components/search_engines", "//google_update", - "//third_party/wtl", "//third_party/iaccessible2", "//third_party/isimpledom", + "//third_party/wtl", "//ui/app_list", ] if (!is_chrome_branded) { diff --git a/chrome/browser/ui/libgtk2ui/BUILD.gn b/chrome/browser/ui/libgtk2ui/BUILD.gn index 9be4824..9b1c927 100644 --- a/chrome/browser/ui/libgtk2ui/BUILD.gn +++ b/chrome/browser/ui/libgtk2ui/BUILD.gn @@ -92,12 +92,12 @@ component("libgtk2ui") { deps = [ "//base", - "//base/third_party/dynamic_annotations", "//base:i18n", - "//chrome/app/theme:theme_resources", + "//base/third_party/dynamic_annotations", "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", + "//chrome/app/theme:theme_resources", "//components/resources", "//content/public/browser", "//mojo/environment:chromium", diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni index 47a431d..71469b0 100644 --- a/chrome/chrome_repack_locales.gni +++ b/chrome/chrome_repack_locales.gni @@ -66,8 +66,8 @@ template("_repack_one_locale") { deps += [ "//content/app/strings", "//device/bluetooth/strings", - "//ui/strings:ui_strings", "//ui/strings:app_locale_settings", + "//ui/strings:ui_strings", ] } if (enable_autofill_dialog) { diff --git a/chrome/chrome_watcher/BUILD.gn b/chrome/chrome_watcher/BUILD.gn index e639861..efd9155 100644 --- a/chrome/chrome_watcher/BUILD.gn +++ b/chrome/chrome_watcher/BUILD.gn @@ -32,9 +32,9 @@ shared_library("chrome_watcher") { deps = [ ":chrome_watcher_resources", ":client", - "//chrome/installer/util", "//base", "//build/config/sanitizers:deps", + "//chrome/installer/util", "//components/browser_watcher", ] ldflags = [ "/DEF:" + rebase_path("chrome_watcher.def", root_build_dir) ] diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index 01e134c..21cf8d8 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -48,9 +48,9 @@ static_library("common") { public_deps = [ "//base:base", + "//base:base_static", "//base:i18n", "//base:prefs", - "//base:base_static", "//chrome:resources", "//chrome:strings", "//chrome/app/theme:theme_resources", @@ -112,16 +112,16 @@ static_library("common") { public_deps += [ ":mojo_bindings", "//chrome/common/net", - "//components/visitedlink/common", "//components/autofill/content/common", "//components/autofill/core/common", "//components/password_manager/content/common", "//components/password_manager/core/common", "//components/signin/core/common", "//components/translate/content/common", + "//components/visitedlink/common", + "//ipc", "//media", "//mojo/public/cpp/bindings", - "//ipc", "//third_party/re2", "//third_party/widevine/cdm:version_h", ] @@ -132,11 +132,11 @@ static_library("common") { ".", "//chrome") public_deps += [ - "//device/usb", "//chrome/common/extensions/api", + "//device/usb", + "//extensions:extensions_resources", "//extensions/common", "//extensions/common/api", - "//extensions:extensions_resources", "//extensions/strings", "//media/cast:net", ] @@ -238,8 +238,8 @@ static_library("common") { if (is_mac) { sources -= [ "channel_info_posix.cc" ] public_deps += [ - "//third_party/mach_override", "//third_party/google_toolbox_for_mac", + "//third_party/mach_override", ] } diff --git a/chrome/installer/gcapi/BUILD.gn b/chrome/installer/gcapi/BUILD.gn index 611ba99..40791d6 100644 --- a/chrome/installer/gcapi/BUILD.gn +++ b/chrome/installer/gcapi/BUILD.gn @@ -32,8 +32,8 @@ source_set("lib") { deps = [ "//base", - "//chrome/installer/util", "//chrome/installer/launcher_support", + "//chrome/installer/util", "//components/variations", "//google_update", ] diff --git a/chrome/installer/test/BUILD.gn b/chrome/installer/test/BUILD.gn index 2f5dfc2..53df9b4 100644 --- a/chrome/installer/test/BUILD.gn +++ b/chrome/installer/test/BUILD.gn @@ -38,8 +38,8 @@ source_set("alternate_version_generator_lib") { deps = [ "//base", "//base:base_static", - "//chrome/installer/util", "//chrome/common:constants", + "//chrome/installer/util", ] } diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index 13b806d..4ab9a7e 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -31,13 +31,13 @@ static_library("renderer") { deps = [ "//base/allocator", - "//chrome/common", - "//chrome/common:mojo_bindings", "//chrome:resources", "//chrome:strings", + "//chrome/common", + "//chrome/common:mojo_bindings", "//components/autofill/content/renderer", - "//components/content_settings/content/common", "//components/cdm/renderer", + "//components/content_settings/content/common", "//components/data_reduction_proxy/content/common", "//components/data_reduction_proxy/core/common", "//components/dom_distiller/content:content_renderer", diff --git a/chrome/service/BUILD.gn b/chrome/service/BUILD.gn index fa56969..bb741209 100644 --- a/chrome/service/BUILD.gn +++ b/chrome/service/BUILD.gn @@ -51,9 +51,9 @@ static_library("service") { configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ + "//base", "//chrome:strings", "//chrome/common", - "//base", "//components/cloud_devices/common", "//google_apis", "//jingle:notifier", diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index defc2a0..88d7b73 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -118,10 +118,9 @@ source_set("test_support") { "//components/sync_driver:test_support", "//components/sync_sessions:test_support", "//components/syncable_prefs:test_support", - "//components/update_client:test_support", "//components/ui/zoom:test_support", + "//components/update_client:test_support", "//content/public/app:both", - "//ui/gfx:test_support", "//net", "//net:test_support", "//skia", @@ -131,6 +130,7 @@ source_set("test_support") { "//testing/gmock", "//testing/gtest", "//third_party/zlib", + "//ui/gfx:test_support", "//ui/message_center:test_support", ] @@ -140,11 +140,6 @@ source_set("test_support") { "//chrome/plugin", "//chrome/renderer", "//chrome/utility", - "//content/public/child", - "//content/public/common", - "//content/public/plugin", - "//content/public/renderer", - "//content/public/utility", "//components/autofill/core/browser:test_support", "//components/captive_portal:test_support", "//components/guest_view/browser:test_support", @@ -152,6 +147,11 @@ source_set("test_support") { "//components/sessions:test_support", "//components/user_manager:test_support", "//components/web_resource:test_support", + "//content/public/child", + "//content/public/common", + "//content/public/plugin", + "//content/public/renderer", + "//content/public/utility", "//google_apis:test_support", "//ipc:test_support", "//media:test_support", @@ -329,13 +329,13 @@ if (!is_android) { ":test_support", ":test_support_ui", "//base/allocator", + "//chrome:packed_extra_resources", + "//chrome:packed_resources", + "//chrome:resources", + "//chrome:strings", "//chrome/browser", "//chrome/browser/devtools", "//chrome/renderer", - "//chrome:resources", - "//chrome:strings", - "//chrome:packed_extra_resources", - "//chrome:packed_resources", "//components/resources", "//content/app/resources", "//crypto:platform", @@ -397,8 +397,7 @@ if (!is_android) { # suites, it seems like one or another starts timing out too. "../browser/ui/views/keyboard_access_browsertest.cc", ] - sources += - [ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ] + sources += [ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ] configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ] } } @@ -588,8 +587,8 @@ if (!is_android) { "//net", "//skia", "//sync", - "//sync:test_support_sync_testserver", "//sync:test_support_sync_fake_server", + "//sync:test_support_sync_testserver", "//ui/app_list:test_support", ] @@ -1323,9 +1322,9 @@ if (!is_android) { "//sync", "//testing/gmock", "//testing/gtest", + "//third_party/WebKit/public:blink", "//third_party/icu", "//third_party/leveldatabase", - "//third_party/WebKit/public:blink", ] data_deps = [ @@ -1544,10 +1543,10 @@ test("unit_tests") { ":test_support_unit", "//base/test:test_support", "//chrome/test:test_support", - "//components/resources", "//components/content_settings/core/test:test_support", - "//content/test:test_support", + "//components/resources", "//content/public/app:both", + "//content/test:test_support", "//crypto:platform", "//crypto:test_support", "//net", @@ -1589,10 +1588,10 @@ test("unit_tests") { "//components/metrics/proto", "//components/safe_browsing_db", "//components/safe_json:test_support", - "//components/webdata_services:test_support", "//components/strings", - "//device/bluetooth:mocks", + "//components/webdata_services:test_support", "//content/app/resources", + "//device/bluetooth:mocks", "//gpu:test_support", "//media:test_support", @@ -1722,9 +1721,9 @@ test("unit_tests") { if (use_aura) { sources += [ "//ui/views/controls/webview/webview_unittest.cc" ] deps += [ - "//ui/wm", "//ui/aura:test_support", "//ui/views:test_support", + "//ui/wm", ] } if (!is_chromeos && is_linux) { @@ -1735,8 +1734,8 @@ test("unit_tests") { } if (!is_chromeos && !use_ozone && is_linux) { deps += [ - "//chrome/browser/ui/libgtk2ui", "//build/linux:gio", + "//chrome/browser/ui/libgtk2ui", ] } @@ -1942,9 +1941,9 @@ test("unit_tests") { } if (!is_mac && !is_ios) { deps += [ - "//chrome/tools/convert_dict:lib", "//chrome:packed_extra_resources", "//chrome:packed_resources", + "//chrome/tools/convert_dict:lib", "//third_party/hunspell", ] } @@ -1976,8 +1975,8 @@ test("unit_tests") { "//chrome") deps += [ "//chrome:other_version", - "//chrome_elf:blacklist_test_dll_1", "//chrome/installer/util:strings", + "//chrome_elf:blacklist_test_dll_1", "//third_party/iaccessible2", "//third_party/isimpledom", "//third_party/wtl", @@ -2104,12 +2103,12 @@ if (is_win || (is_linux && !is_chromeos)) { ] deps = [ ":test_support", + "//base/test:run_all_unittests", + "//base/test:test_support", "//breakpad:client", "//chrome/browser", "//chrome/child", "//components/crash/core/common", - "//base/test:run_all_unittests", - "//base/test:test_support", ] if (cld_version == 2) { # Use whatever CLD2 data access mode that the diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn index 1f65910..67b3f4d 100644 --- a/chrome/test/android/BUILD.gn +++ b/chrome/test/android/BUILD.gn @@ -22,11 +22,11 @@ android_library("chrome_java_test_support") { "//content/public/test/android:content_java_test_support", "//net/android:net_java", "//net/android:net_java_test_support", - "//sync/android:sync_java", "//sync:sync_java_test_support", + "//sync/android:sync_java", "//testing/android/reporter:reporter_java", - "//third_party/android_tools:android_support_v7_appcompat_java", "//third_party/android_tools:android_support_v13_java", + "//third_party/android_tools:android_support_v7_appcompat_java", "//third_party/android_tools:legacy_http_javalib", "//third_party/jsr-305:jsr_305_javalib", "//ui/android:ui_java", diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn index 4777889..4d3dccb 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -27,6 +27,9 @@ static_library("utility") { public_deps = [] deps = [ "//base", + "//chrome:resources", + "//chrome:strings", + "//chrome/common", "//components/safe_json:safe_json_parser_message_filter", "//components/search_engines", "//components/strings", @@ -36,9 +39,6 @@ static_library("utility") { "//media", "//skia", "//third_party/libxml", - "//chrome:resources", - "//chrome:strings", - "//chrome/common", ] if (!is_android) { |