From d7a71c88990b6788ceaf1ec9ee518099709ff3fd Mon Sep 17 00:00:00 2001 From: agrieve Date: Fri, 20 Nov 2015 11:53:28 -0800 Subject: [PATCH] Run gn --format over all .gn files The recent formatter alphebetizing change is causing a lot of noise in code reviews. Figured it'd be worth a clean-up CL. Exact command I ran: find . -name "*.gn*" -exec gn format --in-place "{}" \; TBR=ddorwin@chromium.org BUG=554928 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1464873002 Cr-Commit-Position: refs/heads/master@{#360891} --- BUILD.gn | 2 +- android_webview/BUILD.gn | 16 +- android_webview/native/BUILD.gn | 4 +- ash/BUILD.gn | 21 ++- base/BUILD.gn | 4 +- base/test/BUILD.gn | 4 +- blimp/client/BUILD.gn | 4 +- blimp/engine/browser/BUILD.gn | 2 +- breakpad/BUILD.gn | 6 +- build/config/ios/rules.gni | 4 +- build/config/mac/rules.gni | 4 +- .../third_party/android_tools/BUILD.gn | 2 +- cc/BUILD.gn | 6 +- cc/blink/BUILD.gn | 6 +- chrome/BUILD.gn | 8 +- chrome/android/BUILD.gn | 16 +- chrome/app_shim/BUILD.gn | 2 +- chrome/browser/BUILD.gn | 16 +- chrome/browser/chromeos/BUILD.gn | 22 +-- chrome/browser/devtools/BUILD.gn | 6 +- chrome/browser/extensions/BUILD.gn | 6 +- .../resources/chromeos/chromevox/BUILD.gn | 8 +- chrome/browser/ui/BUILD.gn | 4 +- chrome/browser/ui/libgtk2ui/BUILD.gn | 4 +- chrome/chrome_repack_locales.gni | 2 +- chrome/chrome_watcher/BUILD.gn | 2 +- chrome/common/BUILD.gn | 12 +- chrome/installer/gcapi/BUILD.gn | 2 +- chrome/installer/test/BUILD.gn | 2 +- chrome/renderer/BUILD.gn | 6 +- chrome/service/BUILD.gn | 2 +- chrome/test/BUILD.gn | 49 +++--- chrome/test/android/BUILD.gn | 4 +- chrome/utility/BUILD.gn | 6 +- chromecast/BUILD.gn | 2 +- chromecast/browser/BUILD.gn | 4 +- chromecast/browser/metrics/BUILD.gn | 2 +- chromecast/media/BUILD.gn | 10 +- chromecast/media/cma/pipeline/BUILD.gn | 4 +- chromecast/renderer/BUILD.gn | 2 +- chromeos/BUILD.gn | 14 +- cloud_print/service/win/BUILD.gn | 4 +- components/BUILD.gn | 148 +++++++++--------- components/autofill/content/browser/BUILD.gn | 2 +- components/autofill/content/renderer/BUILD.gn | 2 +- components/autofill/core/browser/BUILD.gn | 12 +- components/autofill/ios/browser/BUILD.gn | 2 +- components/bitmap_uploader/BUILD.gn | 2 +- components/browser_sync/browser/BUILD.gn | 2 +- components/cdm/common/BUILD.gn | 2 +- components/chrome_apps/BUILD.gn | 2 +- components/component_updater/BUILD.gn | 2 +- components/constrained_window/BUILD.gn | 2 +- components/copresence/BUILD.gn | 2 +- components/crash/content/app/BUILD.gn | 2 +- components/crash/core/common/BUILD.gn | 2 +- .../content/browser/BUILD.gn | 2 +- components/drive/BUILD.gn | 1 - components/exo/wayland/BUILD.gn | 2 +- components/feedback/BUILD.gn | 4 +- components/gcm_driver/BUILD.gn | 2 +- components/gcm_driver/crypto/BUILD.gn | 4 +- components/gcm_driver/instance_id/BUILD.gn | 2 +- components/html_viewer/BUILD.gn | 8 +- components/login/BUILD.gn | 2 +- components/mus/BUILD.gn | 2 +- .../mus/example/window_type_launcher/BUILD.gn | 2 +- components/mus/public/interfaces/BUILD.gn | 2 +- components/mus/ws/BUILD.gn | 8 +- components/nacl/BUILD.gn | 4 +- components/net_log/BUILD.gn | 2 +- components/omnibox/browser/BUILD.gn | 6 +- components/ownership/BUILD.gn | 2 +- components/pairing/BUILD.gn | 2 +- .../password_manager/sync/browser/BUILD.gn | 4 +- components/pdf/renderer/BUILD.gn | 2 +- components/pdf_viewer/BUILD.gn | 2 +- components/policy/android/BUILD.gn | 4 +- components/precache/android/BUILD.gn | 2 +- components/proximity_auth/ble/BUILD.gn | 2 +- components/renderer_context_menu/BUILD.gn | 2 +- components/rlz/BUILD.gn | 2 +- components/search_engines/BUILD.gn | 4 +- components/signin/core/browser/BUILD.gn | 14 +- components/sync_driver/BUILD.gn | 2 +- components/sync_sessions/BUILD.gn | 4 +- components/syncable_prefs/BUILD.gn | 2 +- components/translate/ios/browser/BUILD.gn | 4 +- components/update_client/BUILD.gn | 8 +- components/url_formatter/BUILD.gn | 2 +- components/user_prefs/tracked/BUILD.gn | 2 +- components/variations/BUILD.gn | 6 +- .../service/generate_ui_string_overrider.gni | 2 +- components/version_info/BUILD.gn | 2 +- .../web_contents_delegate_android/BUILD.gn | 2 +- components/web_resource/BUILD.gn | 2 +- components/web_view/BUILD.gn | 2 +- .../web_view/public/interfaces/BUILD.gn | 4 +- components/webcrypto/BUILD.gn | 2 +- components/webp_transcode/BUILD.gn | 2 +- content/plugin/BUILD.gn | 2 +- content/ppapi_plugin/BUILD.gn | 2 +- content/public/android/BUILD.gn | 14 +- content/public/renderer/BUILD.gn | 2 +- content/renderer/BUILD.gn | 8 +- content/shell/BUILD.gn | 2 +- content/shell/android/BUILD.gn | 12 +- content/test/BUILD.gn | 32 ++-- device/bluetooth/BUILD.gn | 4 +- device/usb/BUILD.gn | 2 +- extensions/BUILD.gn | 2 +- extensions/common/BUILD.gn | 2 +- extensions/common/api/BUILD.gn | 2 +- .../components/native_app_window/BUILD.gn | 6 +- extensions/shell/BUILD.gn | 8 +- gpu/BUILD.gn | 14 +- gpu/blink/BUILD.gn | 8 +- gpu/command_buffer/client/BUILD.gn | 4 +- gpu/gles2_conform_support/egl/BUILD.gn | 2 +- ios/chrome/BUILD.gn | 2 +- ios/chrome/browser/BUILD.gn | 4 +- ios/net/BUILD.gn | 2 +- ios/testing/BUILD.gn | 2 +- ios/web/BUILD.gn | 12 +- ipc/mojo/BUILD.gn | 2 +- jingle/BUILD.gn | 2 +- mandoline/BUILD.gn | 2 +- mandoline/app/android/BUILD.gn | 4 +- mandoline/ui/desktop_ui/BUILD.gn | 2 +- mandoline/ui/phone_ui/BUILD.gn | 2 +- mash/wm/BUILD.gn | 4 +- media/base/BUILD.gn | 4 +- media/blink/BUILD.gn | 2 +- media/cast/BUILD.gn | 2 +- media/midi/BUILD.gn | 2 +- media/mojo/services/BUILD.gn | 2 +- media/test/BUILD.gn | 2 +- mojo/android/BUILD.gn | 8 +- mojo/application/public/cpp/BUILD.gn | 2 +- mojo/converters/surfaces/BUILD.gn | 2 +- mojo/converters/surfaces/tests/BUILD.gn | 2 +- mojo/converters/transform/BUILD.gn | 2 +- mojo/edk/embedder/BUILD.gn | 2 +- mojo/edk/js/BUILD.gn | 2 +- mojo/edk/system/BUILD.gn | 12 +- mojo/package_manager/BUILD.gn | 2 +- mojo/public/BUILD.gn | 2 +- mojo/public/c/gpu/BUILD.gn | 2 +- mojo/public/mojo_application.gni | 2 +- mojo/public/platform/native/BUILD.gn | 2 +- mojo/runner/BUILD.gn | 4 +- mojo/runner/child/BUILD.gn | 2 +- mojo/runner/host/BUILD.gn | 2 +- mojo/services/network/BUILD.gn | 2 +- mojo/shell/BUILD.gn | 6 +- net/BUILD.gn | 6 +- net/android/BUILD.gn | 6 +- ppapi/host/BUILD.gn | 4 +- ppapi/native_client/BUILD.gn | 12 +- remoting/BUILD.gn | 3 +- remoting/host/BUILD.gn | 8 +- remoting/test/BUILD.gn | 2 +- .../javascript_key_tester/pnacl/BUILD.gn | 2 +- remoting/webapp/build_template.gni | 10 +- sandbox/linux/BUILD.gn | 2 +- sandbox/win/BUILD.gn | 2 +- skia/BUILD.gn | 6 +- sql/BUILD.gn | 4 +- storage/common/BUILD.gn | 2 +- sync/BUILD.gn | 12 +- sync/android/BUILD.gn | 2 +- testing/android/junit/BUILD.gn | 2 +- .../WebKit/Source/bindings/core/BUILD.gn | 2 +- .../WebKit/Source/bindings/modules/BUILD.gn | 2 +- .../Source/bindings/scripts/scripts.gni | 5 +- third_party/WebKit/Source/core/BUILD.gn | 62 ++++---- third_party/WebKit/Source/devtools/BUILD.gn | 8 +- third_party/WebKit/Source/modules/BUILD.gn | 4 +- third_party/WebKit/Source/web/BUILD.gn | 6 +- third_party/WebKit/public/BUILD.gn | 2 +- third_party/android_media/BUILD.gn | 4 +- third_party/cld_2/BUILD.gn | 2 +- third_party/custom_tabs_client/BUILD.gn | 2 +- third_party/fontconfig/BUILD.gn | 2 +- third_party/freetype-android/BUILD.gn | 18 +-- third_party/libjingle/BUILD.gn | 6 +- third_party/libphonenumber/BUILD.gn | 2 +- third_party/libvpx_new/BUILD.gn | 8 +- third_party/mesa/BUILD.gn | 2 +- third_party/mockito/BUILD.gn | 2 +- .../mojo/src/mojo/edk/embedder/BUILD.gn | 2 +- third_party/mojo/src/mojo/edk/js/BUILD.gn | 2 +- third_party/mojo/src/mojo/edk/system/BUILD.gn | 2 +- third_party/robolectric/BUILD.gn | 2 +- third_party/widevine/cdm/BUILD.gn | 4 +- third_party/yasm/BUILD.gn | 2 +- tools/android/heap_profiler/BUILD.gn | 2 +- .../kerberos/SpnegoAuthenticator/BUILD.gn | 2 +- ui/android/BUILD.gn | 4 +- ui/app_list/BUILD.gn | 6 +- ui/aura/BUILD.gn | 4 +- ui/base/BUILD.gn | 4 +- ui/base/ime/BUILD.gn | 4 +- ui/compositor/BUILD.gn | 4 +- ui/file_manager/BUILD.gn | 2 +- ui/gfx/BUILD.gn | 4 +- ui/keyboard/BUILD.gn | 2 +- ui/message_center/BUILD.gn | 2 +- ui/ozone/platform/cast/BUILD.gn | 2 +- ui/ozone/platform/headless/BUILD.gn | 2 +- ui/platform_window/android/BUILD.gn | 4 +- ui/resources/BUILD.gn | 2 +- ui/shell_dialogs/BUILD.gn | 2 +- ui/strings/BUILD.gn | 2 +- ui/views/BUILD.gn | 4 +- ui/views/examples/BUILD.gn | 2 +- ui/views/mus/BUILD.gn | 4 +- ui/wm/BUILD.gn | 2 +- url/BUILD.gn | 2 +- win8/BUILD.gn | 4 +- 220 files changed, 587 insertions(+), 596 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 4fd53cce3ffaeb..3522948f486d37 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -708,7 +708,7 @@ group("gn_only") { # these are needed only for gn to discover build files. deps += [ "//testing/libfuzzer:libfuzzer_main", - "//testing/libfuzzer/fuzzers:string_to_int_fuzzer" + "//testing/libfuzzer/fuzzers:string_to_int_fuzzer", ] } } diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn index 729d4ea75e1603..381a4a15040328 100644 --- a/android_webview/BUILD.gn +++ b/android_webview/BUILD.gn @@ -98,11 +98,11 @@ repack("repack_pack") { ] deps = [ ":generate_aw_resources", - "//third_party/WebKit/public:image_resources", - "//third_party/WebKit/public:resources", - "//content/app/resources", "//content:resources", + "//content/app/resources", "//net:net_resources", + "//third_party/WebKit/public:image_resources", + "//third_party/WebKit/public:resources", "//ui/resources", ] output = "$target_gen_dir/webviewchromium.pak" @@ -471,15 +471,15 @@ source_set("common") { "//cc/surfaces", "//components/auto_login_parser:auto_login_parser", "//components/autofill/content/renderer", - "//components/crash/content/app", - "//components/crash/content/browser", "//components/cdm/browser", "//components/cdm/renderer", + "//components/crash/content/app", + "//components/crash/content/browser", "//components/data_reduction_proxy/core/browser", "//components/devtools_discovery", "//components/navigation_interception", - "//components/printing/common", "//components/printing/browser", + "//components/printing/common", "//components/printing/renderer", "//components/visitedlink/browser", "//components/visitedlink/renderer", @@ -489,11 +489,11 @@ source_set("common") { "//content/public/browser", "//gin", "//gpu/blink", - "//gpu/command_buffer/common:gles2_utils", - "//gpu/command_buffer/service", "//gpu/command_buffer/client:gl_in_process_context", "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", + "//gpu/command_buffer/common:gles2_utils", + "//gpu/command_buffer/service", "//gpu/skia_bindings", "//media", "//media/midi", diff --git a/android_webview/native/BUILD.gn b/android_webview/native/BUILD.gn index a76af83b455ea1..320cbb31421dfe 100644 --- a/android_webview/native/BUILD.gn +++ b/android_webview/native/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/android/rules.gni") source_set("native") { deps = [ + ":native_jni", "//android_webview/common:version", "//base", "//base/third_party/dynamic_annotations:dynamic_annotations", @@ -21,11 +22,10 @@ source_set("native") { "//skia", "//storage/browser", "//storage/common", + "//third_party/boringssl", "//ui/base", "//ui/gfx", "//ui/gfx/geometry:geometry", - "//third_party/boringssl", - ":native_jni", ] include_dirs = [ "//skia/config" ] diff --git a/ash/BUILD.gn b/ash/BUILD.gn index 067e045bcbb321..06bfa93f76388a 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -96,15 +96,15 @@ component("ash") { if (is_chromeos) { deps += [ - "//device/bluetooth", - "//ui/display", - "//ui/display/util", "//chromeos", "//chromeos:power_manager_proto", + "//device/bluetooth", "//third_party/qcms", + "//ui/chromeos:ui_chromeos", "//ui/chromeos/resources", "//ui/chromeos/strings", - "//ui/chromeos:ui_chromeos", + "//ui/display", + "//ui/display/util", ] } else { sources -= [ @@ -245,7 +245,6 @@ static_library("ash_shell_lib") { "//ash/strings", "//base", "//base:i18n", - "//net", "//skia", "//third_party/icu", @@ -275,9 +274,9 @@ static_library("ash_shell_lib_with_content") { deps = [ #"//chrome:packed_resources", TODO(GYP) + ":ash_shell_lib", "//content", "//content/shell:content_shell_lib", - ":ash_shell_lib", "//skia", ] } @@ -306,14 +305,14 @@ test("ash_unittests") { "//ui/aura", "//ui/aura:test_support", "//ui/base", - "//ui/base/ime", "//ui/base:test_support", + "//ui/base/ime", "//ui/compositor", "//ui/compositor:test_support", "//ui/events", - "//ui/events/devices", - "//ui/events:test_support", "//ui/events:gesture_detection", + "//ui/events:test_support", + "//ui/events/devices", "//ui/gfx", "//ui/gfx/geometry", "//ui/keyboard", @@ -361,13 +360,13 @@ test("ash_unittests") { if (is_chromeos) { sources += [ "first_run/first_run_helper_unittest.cc" ] deps += [ + "//chromeos:power_manager_proto", + "//chromeos:test_support_without_gmock", "//device/bluetooth", "//ui/display", "//ui/display:test_support", "//ui/display:test_util", "//ui/display/types", - "//chromeos:power_manager_proto", - "//chromeos:test_support_without_gmock", ] } else { sources -= [ diff --git a/base/BUILD.gn b/base/BUILD.gn index 9e4270d26009f8..97e097ea1e7781 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -734,8 +734,8 @@ component("base") { deps += [ ":base_jni_headers", - "//third_party/ashmem", "//third_party/android_tools:cpu_features", + "//third_party/ashmem", ] # logging.cc uses the Android logging library. @@ -1073,8 +1073,8 @@ if (is_ios || is_android || is_win || (is_linux && !is_chromeos)) { ":base", "//base/test:test_support", "//base/test:test_support_perf", - "//testing/perf", "//testing/gtest", + "//testing/perf", ] if (is_android) { diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index 75a77d22f7753b..4c9b7840354fe2 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn @@ -143,15 +143,15 @@ source_set("test_support") { public_deps = [ ":test_config", "//base", - "//base:i18n", "//base:base_static", + "//base:i18n", ] deps = [ "//base/third_party/dynamic_annotations", "//testing/gmock", "//testing/gtest", - "//third_party/libxml", "//third_party/icu:icuuc", + "//third_party/libxml", ] if (!is_posix) { diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn index e630200b50e566..d4ecbad0048f63 100644 --- a/blimp/client/BUILD.gn +++ b/blimp/client/BUILD.gn @@ -192,10 +192,10 @@ if (is_android) { android_apk("blimp_apk") { deps = [ ":blimp_apk_manifest", - ":blimp_java", - ":blimp_java_resources", ":blimp_client", ":blimp_java", + ":blimp_java", + ":blimp_java_resources", "//base:base_java", google_play_services_resources, ] diff --git a/blimp/engine/browser/BUILD.gn b/blimp/engine/browser/BUILD.gn index 3a1451b043412a..a4ce000d104de5 100644 --- a/blimp/engine/browser/BUILD.gn +++ b/blimp/engine/browser/BUILD.gn @@ -23,8 +23,8 @@ source_set("browser") { deps = [ "//base", "//blimp/common/proto", - "//blimp/net:blimp_net", "//blimp/engine/ui", + "//blimp/net:blimp_net", "//content", "//content/public/browser", "//content/public/common", diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn index 08af6c72494ce4..9dabd8176baf7d 100644 --- a/breakpad/BUILD.gn +++ b/breakpad/BUILD.gn @@ -378,9 +378,9 @@ if (is_mac) { include_dirs = [ "src/client/apple/Framework" ] deps = [ - ":utilities", ":crash_inspector", ":crash_report_sender", + ":utilities", ] } @@ -622,12 +622,12 @@ if (is_linux || is_android) { deps = [ ":client", - ":processor_support", ":linux_dumper_unittest_helper", + ":processor_support", "//build/config/sanitizers:deps", + "//testing/gmock", "//testing/gtest", "//testing/gtest:gtest_main", - "//testing/gmock", ] include_dirs = [ diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni index 4370393daf2b68..c18c06554e94f6 100644 --- a/build/config/ios/rules.gni +++ b/build/config/ios/rules.gni @@ -169,8 +169,8 @@ template("ios_app") { identity = invoker.code_signing_identity application_path = "$root_build_dir/$app_name.app" deps = [ - ":$plist_gen_target_name", ":$bin_gen_target_name", + ":$plist_gen_target_name", ] } } else { @@ -181,8 +181,8 @@ template("ios_app") { # Top level group group(target_name) { deps = [ - ":$plist_gen_target_name", ":$bin_gen_target_name", + ":$plist_gen_target_name", ] if (invoker.code_signing_identity != "") { deps += [ ":$code_sign_gen_target_name" ] diff --git a/build/config/mac/rules.gni b/build/config/mac/rules.gni index 8baad60597b9cf..32f3d99914d43f 100644 --- a/build/config/mac/rules.gni +++ b/build/config/mac/rules.gni @@ -195,10 +195,10 @@ template("mac_app") { group(copy_all_target_name) { visibility = [ ":$group_gen_target_name" ] deps = [ - ":$struct_gen_target_name", - ":$copy_plist_gen_target_name", ":$copy_bin_target_name", + ":$copy_plist_gen_target_name", ":$copy_xib_target_name", + ":$struct_gen_target_name", ] } diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn index c849d0359277ef..fa2f67ab93589e 100644 --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn @@ -68,8 +68,8 @@ android_resources("android_support_v7_mediarouter_resources") { android_java_prebuilt("android_support_v7_mediarouter_java") { deps = [ - ":android_support_v7_mediarouter_resources", ":android_support_v7_appcompat_java", + ":android_support_v7_mediarouter_resources", ] jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar" } diff --git a/cc/BUILD.gn b/cc/BUILD.gn index c3b9b8ac0129b2..8fd1828e7ef8ff 100644 --- a/cc/BUILD.gn +++ b/cc/BUILD.gn @@ -686,9 +686,9 @@ source_set("test_support") { "//base/third_party/dynamic_annotations", "//cc/surfaces", "//cc/surfaces:surface_id", + "//gpu/command_buffer/client:gl_in_process_context", "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", - "//gpu/command_buffer/client:gl_in_process_context", "//gpu/command_buffer/common:gles2_utils", "//gpu/skia_bindings", "//media", @@ -696,8 +696,8 @@ source_set("test_support") { "//testing/gmock", "//testing/gtest", "//ui/gfx", - "//ui/gfx/geometry", "//ui/gfx:test_support", + "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", ] @@ -888,8 +888,8 @@ test("cc_unittests") { "//testing/gtest", "//ui/events:events_base", "//ui/gfx", - "//ui/gfx/geometry", "//ui/gfx:test_support", + "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", ] diff --git a/cc/blink/BUILD.gn b/cc/blink/BUILD.gn index 4ee8862a9ae464..a501f5e642acc8 100644 --- a/cc/blink/BUILD.gn +++ b/cc/blink/BUILD.gn @@ -90,13 +90,13 @@ if (!is_mac) { ":blink", "//base/test:test_support", "//base/third_party/dynamic_annotations", + "//cc", + "//cc:test_support", "//skia", "//testing/gtest", "//third_party/WebKit/public:blink", - "//ui/gfx/geometry", "//ui/gfx:test_support", - "//cc", - "//cc:test_support", + "//ui/gfx/geometry", ] } } diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index ed18e5139e86fe..0a09f8e618d8f4 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 8379c7a4bdfa9d..9cef154d8218a7 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 c4c164b080be4e..74bca935118768 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 e1d05f9eacc4b7..f93e73b430ea25 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 5c5d3b88627952..bb24b8d14bc52a 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 496e5531e98059..3088e41422f861 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 14208a92e54637..c0930412ea067c 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 c3bce7ef6a5ab8..e2a169361a9375 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 c945da10a64f15..6c1d26a860c817 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 9be4824345cb5d..9b1c927360a665 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 47a431d6d8a22e..71469b0983ad87 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 e6398616acf92f..efd91550c99ba5 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 01e134cbb98f01..21cf8d8676408d 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 611ba992393dcc..40791d654320af 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 2f5dfc27ffe890..53df9b4eff4034 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 13b806d7d58b59..4ab9a7e89b9fc5 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 fa56969588bbd2..bb741209260f26 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 defc2a0b49019e..88d7b73a1be232 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 1f659107f72617..67b3f4d0daaffa 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 4777889d9db3df..4d3dccb0bcd682 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) { diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn index b529c499eefad0..d6afec4c971713 100644 --- a/chromecast/BUILD.gn +++ b/chromecast/BUILD.gn @@ -203,8 +203,8 @@ repack("cast_shell_pak") { "//content/app/resources", "//content/app/strings", "//net:net_resources", - "//third_party/WebKit/public:resources", "//third_party/WebKit/public:image_resources_grit", + "//third_party/WebKit/public:resources", "//ui/resources", "//ui/strings", ] diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn index 2fc0a3b3cb3b62..a38dab138fac71 100644 --- a/chromecast/browser/BUILD.gn +++ b/chromecast/browser/BUILD.gn @@ -62,8 +62,8 @@ source_set("browser") { deps = [ "//base", - "//base:prefs", "//base:i18n", + "//base:prefs", "//cc", "//chromecast/app:chromecast_settings", "//chromecast/app:resources", @@ -92,8 +92,8 @@ source_set("browser") { "//content/public/common", "//content/public/utility", "//gpu", - "//media", "//ipc", + "//media", "//net", "//ui/aura", "//ui/base", diff --git a/chromecast/browser/metrics/BUILD.gn b/chromecast/browser/metrics/BUILD.gn index 81233e8ca05c98..fad608a3dd2fae 100644 --- a/chromecast/browser/metrics/BUILD.gn +++ b/chromecast/browser/metrics/BUILD.gn @@ -22,8 +22,8 @@ source_set("metrics") { "//components/metrics:gpu", "//components/metrics:net", "//components/metrics:profiler", - "//content/public/common", "//content/public/browser", + "//content/public/common", ] if (is_linux) { diff --git a/chromecast/media/BUILD.gn b/chromecast/media/BUILD.gn index b54ba7d1603b7a..2b0e5c824af0c9 100644 --- a/chromecast/media/BUILD.gn +++ b/chromecast/media/BUILD.gn @@ -38,6 +38,11 @@ test("cast_media_unittests") { deps = [ ":media", + "//base", + "//base:i18n", + "//base/test:test_support", + "//chromecast/base", + "//chromecast/base/metrics:test_support", "//chromecast/media/audio", "//chromecast/media/base:message_loop", "//chromecast/media/cma/backend", @@ -45,11 +50,6 @@ test("cast_media_unittests") { "//chromecast/media/cma/ipc", "//chromecast/media/cma/ipc_streamer", "//chromecast/media/cma/pipeline", - "//base", - "//base:i18n", - "//base/test:test_support", - "//chromecast/base", - "//chromecast/base/metrics:test_support", "//chromecast/public", "//media", "//media/base:test_support", diff --git a/chromecast/media/cma/pipeline/BUILD.gn b/chromecast/media/cma/pipeline/BUILD.gn index c8581e64712467..a5809da8a813ce 100644 --- a/chromecast/media/cma/pipeline/BUILD.gn +++ b/chromecast/media/cma/pipeline/BUILD.gn @@ -30,10 +30,10 @@ source_set("pipeline") { deps = [ "//base", - "//chromecast/media/cma/backend", - "//chromecast/media/cma/base", "//chromecast/media/base", "//chromecast/media/cdm", + "//chromecast/media/cma/backend", + "//chromecast/media/cma/base", "//crypto", "//crypto:platform", "//media", diff --git a/chromecast/renderer/BUILD.gn b/chromecast/renderer/BUILD.gn index 940fc39fcf208e..ae6dfa359e506c 100644 --- a/chromecast/renderer/BUILD.gn +++ b/chromecast/renderer/BUILD.gn @@ -33,8 +33,8 @@ source_set("renderer") { deps = [ "//base", "//chromecast/base", - "//chromecast/crash", "//chromecast/common/media", + "//chromecast/crash", "//chromecast/media", "//components/cdm/renderer", "//components/network_hints/renderer", diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn index 268a5b2af95a3e..b25c21a8b678e8 100644 --- a/chromeos/BUILD.gn +++ b/chromeos/BUILD.gn @@ -20,14 +20,16 @@ component("chromeos") { "//dbus", ] deps = [ + ":cryptohome_proto", + ":power_manager_proto", "//base", "//base:i18n", "//base:prefs", "//base/third_party/dynamic_annotations", "//chromeos/ime:gencode", "//components/device_event_log", - "//components/policy/proto", "//components/onc", + "//components/policy/proto", "//components/proxy_config", "//components/signin/core/account_id", "//crypto", @@ -37,8 +39,6 @@ component("chromeos") { "//third_party/libxml", "//third_party/protobuf:protobuf_lite", "//url", - ":cryptohome_proto", - ":power_manager_proto", ] sources = gypi_values.chromeos_sources defines = [ "CHROMEOS_IMPLEMENTATION" ] @@ -109,10 +109,10 @@ static_library("test_support_without_gmock") { testonly = true configs += [ "//build/config/linux:dbus" ] deps = [ - "//crypto", ":chromeos", ":cryptohome_proto", ":power_manager_proto", + "//crypto", ] sources = [ "dbus/fake_cros_disks_client.cc", @@ -132,6 +132,9 @@ test("chromeos_unittests") { "//net/third_party/nss/ssl:ssl_config", ] deps = [ + ":cryptohome_proto", + ":power_manager_proto", + ":test_support", "//base:prefs_test_support", "//base/test:run_all_unittests", "//base/test:test_support", @@ -147,9 +150,6 @@ test("chromeos_unittests") { "//testing/gtest", "//third_party/icu", "//url", - ":cryptohome_proto", - ":power_manager_proto", - ":test_support", ] sources = gypi_values.chromeos_test_sources if (use_allocator != "none") { diff --git a/cloud_print/service/win/BUILD.gn b/cloud_print/service/win/BUILD.gn index 2c050b0be97bf6..1cc937fcae0e55 100644 --- a/cloud_print/service/win/BUILD.gn +++ b/cloud_print/service/win/BUILD.gn @@ -79,8 +79,8 @@ executable("cloud_print_service_config") { ":config_version", ":exe_manifest", "//cloud_print/common:install_utils", - "//cloud_print/service:resources", "//cloud_print/service:lib", + "//cloud_print/service:resources", ] libs = [ "secur32.lib" ] @@ -106,8 +106,8 @@ executable("cloud_print_service_setup") { deps = [ ":exe_manifest", "//cloud_print/common:install_utils", - "//cloud_print/service:resources", "//cloud_print/service:lib", + "//cloud_print/service:resources", ] libs = [ "secur32.lib" ] diff --git a/components/BUILD.gn b/components/BUILD.gn index 33fbe665faa707..b72787f42df012 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -47,63 +47,66 @@ group("all_components") { "//components/history/core/browser", "//components/history/core/common", "//components/history/core/test", + "//components/infobars/core", + "//components/invalidation/impl", + "//components/invalidation/public", "//components/keyed_service/core", + "//components/leveldb_proto", "//components/metrics", "//components/net_log", "//components/network_time", "//components/ntp_snippets", + "//components/omnibox/browser", + "//components/open_from_clipboard", + "//components/os_crypt", "//components/password_manager/core/browser", "//components/password_manager/core/common", "//components/password_manager/sync/browser", + "//components/pref_registry", + "//components/proxy_config", + "//components/rappor", "//components/search", "//components/search_engines", "//components/sessions", - "//components/sync_bookmarks", - "//components/undo", - "//components/update_client", - "//components/strings", - "//components/leveldb_proto", - "//components/pref_registry", - "//components/rappor", - "//components/proxy_config", - "//components/omnibox/browser", - "//components/open_from_clipboard", - "//components/infobars/core", - "//components/invalidation/impl", - "//components/invalidation/public", "//components/signin/core/browser", + "//components/strings", "//components/suggestions", + "//components/sync_bookmarks", "//components/sync_driver", "//components/syncable_prefs", "//components/translate/core/browser", "//components/translate/core/common", + "//components/undo", + "//components/update_client", "//components/upload_list", "//components/variations", "//components/variations/service", "//components/version_info", "//components/version_ui", - "//components/os_crypt", "//components/web_resource", "//components/webdata_services", ] if (!is_ios) { deps += [ - "//components/bitmap_uploader", - "//components/certificate_reporting", - "//components/cdm/browser", "//components/about_handler", + "//components/app_modal", "//components/auto_login_parser", "//components/autofill/content/browser", "//components/autofill/content/common", "//components/autofill/content/renderer", + "//components/bitmap_uploader", + "//components/browsing_data", "//components/bubble", "//components/captive_portal", "//components/cdm/browser", + "//components/cdm/browser", "//components/cdm/common", "//components/cdm/renderer", - "//components/cloud_devices/common", + "//components/certificate_reporting", + "//components/certificate_transparency", "//components/chrome_apps", + "//components/cloud_devices/common", "//components/compression", "//components/cookie_config", "//components/crash/content/app", @@ -120,6 +123,9 @@ group("all_components") { "//components/feedback", "//components/gcm_driver/crypto", "//components/gcm_driver/instance_id", + "//components/guest_view/browser", + "//components/guest_view/common", + "//components/guest_view/renderer", "//components/history/content/browser", "//components/json_schema", "//components/keyed_service/content", @@ -143,18 +149,21 @@ group("all_components") { "//components/pdf/renderer", "//components/plugins/renderer", "//components/power", - "//components/precache/core", "//components/precache/content", + "//components/precache/core", "//components/query_parser", "//components/renderer_context_menu", "//components/resources:components_resources", "//components/safe_browsing_db", + "//components/safe_json", + "//components/scheduler", "//components/search_provider_logos", "//components/security_interstitials/core", "//components/ssl_config", - "//components/startup_metric_utils/common", "//components/startup_metric_utils/browser", + "//components/startup_metric_utils/common", "//components/sync_sessions", + "//components/test_runner", "//components/tracing", "//components/tracing:startup_tracing", "//components/translate/content/browser", @@ -175,19 +184,10 @@ group("all_components") { "//components/web_cache/renderer", "//components/web_modal", "//components/webcrypto", + "//components/webcrypto", "//components/webdata/common", "//components/wifi", "//components/wifi_sync", - "//components/app_modal", - "//components/browsing_data", - "//components/certificate_transparency", - "//components/guest_view/browser", - "//components/guest_view/common", - "//components/guest_view/renderer", - "//components/safe_json", - "//components/scheduler", - "//components/test_runner", - "//components/webcrypto", ] if (enable_configuration_policy) { @@ -210,11 +210,11 @@ group("all_components") { # TODO(agrieve): Add to main deps list once compile errors are resolved. deps += [ "//components/audio_modem", + "//components/copresence", "//components/proximity_auth", "//components/proximity_auth/cryptauth", - "//components/webusb", - "//components/copresence", "//components/storage_monitor", + "//components/webusb", ] } @@ -261,13 +261,13 @@ group("all_components") { "//components/autofill/content/browser", # Blocked on content/blink. "//components/autofill/content/common", # Blocked on content. "//components/autofill/content/renderer", # Blocked on content/blink. - "//components/crash/content/app", # Should work, needs checking. - "//components/crash/content/browser", # Should work, needs checking. "//components/captive_portal", # Should work, needs checking. - "//components/cloud_devices/common", # Should work, needs checking. "//components/cdm/browser", # Blocked on content. "//components/cdm/common", # Blocked on content. "//components/cdm/renderer", # Blocked on content. + "//components/cloud_devices/common", # Should work, needs checking. + "//components/crash/content/app", # Should work, needs checking. + "//components/crash/content/browser", # Should work, needs checking. "//components/data_reduction_proxy/core/browser", # Should work, needs checking. "//components/data_reduction_proxy/core/common", # Should work, needs checking. "//components/dom_distiller/core", # Blocked on content. @@ -283,16 +283,16 @@ group("all_components") { "//components/invalidation/impl", # Should work, needs checking. "//components/invalidation/public", # Should work, needs checking. "//components/json_schema", # Should work, needs checking. - "//components/keyed_service/core", # Blocked on content. "//components/keyed_service/content", # Blocked on content. + "//components/keyed_service/core", # Blocked on content. "//components/navigation_interception", # Blocked on content. "//components/omnibox/browser", # Should work, needs checking. "//components/password_manager/content/browser", # Blocked on content. "//components/password_manager/core/browser", # Should work, needs checking. "//components/password_manager/core/common", # Should work, needs checking. "//components/plugins/renderer", # Blocked on blink. - "//components/power", # Blocked on content. "//components/policy", # Blocked on content (indirectly via autofill). + "//components/power", # Blocked on content. "//components/precache/content", # Blocked on content. "//components/precache/core", # Should work, needs checking. "//components/rappor", # Should work, needs checking. @@ -310,8 +310,8 @@ group("all_components") { "//components/visitedlink/renderer", # Blocked on blink "//components/web_cache/browser", # Blocked on content and blink. "//components/web_cache/renderer", # Blocked on content and blink. - "//components/webdata_services", # Should work, needs checking. "//components/web_modal", # Blocked on content. + "//components/webdata_services", # Should work, needs checking. ] } } @@ -369,75 +369,63 @@ test("components_unittests") { "//components/history/core/common:unit_tests", "//components/invalidation/impl:unit_tests", "//components/keyed_service/core:unit_tests", + "//components/leveldb_proto:unit_tests", "//components/metrics:unit_tests", "//components/net_log:unit_tests", "//components/network_time:unit_tests", + "//components/omnibox/browser:unit_tests", "//components/open_from_clipboard:unit_tests", + "//components/os_crypt:unit_tests", "//components/password_manager/core/browser:unit_tests", "//components/password_manager/core/common:unit_tests", "//components/password_manager/sync/browser:unit_tests", "//components/proxy_config:unit_tests", "//components/rappor:unit_tests", "//components/search:unit_tests", - "//components/sessions:unit_tests", - "//components/syncable_prefs:unit_tests", - "//components/undo:unit_tests", - "//components/update_client:unit_tests", - "//components/upload_list:unit_tests", - "//net", - "//ui/base", - "//ui/resources:ui_test_pak", "//components/search_engines:unit_tests", - "//components/leveldb_proto:unit_tests", + "//components/sessions:unit_tests", "//components/signin/core/browser:unit_tests", "//components/suggestions:unit_tests", "//components/sync_driver:unit_tests", + "//components/syncable_prefs:unit_tests", "//components/translate/core/browser:unit_tests", "//components/translate/core/common:unit_tests", "//components/translate/core/language_detection:unit_tests", + "//components/undo:unit_tests", + "//components/update_client:unit_tests", + "//components/upload_list:unit_tests", "//components/variations:unit_tests", "//components/variations/service:unit_tests", - "//components/omnibox/browser:unit_tests", - "//components/os_crypt:unit_tests", "//components/web_resource:unit_tests", + "//net", + "//ui/base", + "//ui/resources:ui_test_pak", ] if (!is_ios) { deps += [ - "//components/certificate_transparency:unit_tests", - "//components/data_use_measurement/content:unit_tests", - "//components/error_page/renderer:unit_tests", - "//components/guest_view/browser:unit_tests", - "//components/navigation_interception:unit_tests", - "//components/network_hints/renderer:unit_tests", - "//components/page_load_metrics/browser:unit_tests", - "//components/page_load_metrics/renderer:unit_tests", - "//components/power:unit_tests", - "//components/safe_json:unit_tests", - "//components/scheduler:unit_tests", - "//components/test_runner:test_runner", - "//components/tracing:unit_tests", - "//components/ui/zoom:unit_tests", - "//components/visitedlink/test:unit_tests", - "//components/web_cache/browser:unit_tests", "//components/auto_login_parser:unit_tests", "//components/autofill/content/browser:unit_tests", "//components/autofill/content/renderer:unit_tests", "//components/bubble:unit_tests", "//components/captive_portal:unit_tests", + "//components/certificate_transparency:unit_tests", "//components/cloud_devices/common:unit_tests", "//components/component_updater:unit_tests", "//components/crx_file:unit_tests", "//components/data_reduction_proxy/content/browser:unit_tests", "//components/data_reduction_proxy/core/browser:unit_tests", "//components/data_reduction_proxy/core/common:unit_tests", + "//components/data_use_measurement/content:unit_tests", "//components/device_event_log:unit_tests", "//components/devtools_http_handler:unit_tests", "//components/dom_distiller/content:unit_tests", "//components/domain_reliability:unit_tests", + "//components/error_page/renderer:unit_tests", "//components/favicon/content:unit_tests", "//components/gcm_driver/crypto:unit_tests", "//components/gcm_driver/instance_id:unit_tests", + "//components/guest_view/browser:unit_tests", "//components/history/content/browser:unit_tests", "//components/json_schema:unit_tests", "//components/keyed_service/content:unit_tests", @@ -445,23 +433,35 @@ test("components_unittests") { "//components/login:unit_tests", "//components/memory_pressure:unit_tests", "//components/mime_util:unit_tests", + "//components/navigation_interception:unit_tests", + "//components/network_hints/renderer:unit_tests", "//components/offline_pages:unit_tests", "//components/packed_ct_ev_whitelist:unit_tests", + "//components/page_load_metrics/browser:unit_tests", + "//components/page_load_metrics/renderer:unit_tests", "//components/password_manager/content/browser:unit_tests", + "//components/power:unit_tests", "//components/precache/content:unit_tests", "//components/precache/core:unit_tests", "//components/query_parser:unit_tests", "//components/safe_browsing_db:unit_tests", - "//components/search_engines:unit_tests", + "//components/safe_json:unit_tests", + "//components/scheduler:unit_tests", "//components/search:unit_tests", + "//components/search_engines:unit_tests", "//components/search_provider_logos:unit_tests", "//components/ssl_config:unit_tests", "//components/sync_bookmarks:unit_tests", "//components/sync_sessions:unit_tests", + "//components/test_runner:test_runner", + "//components/tracing:unit_tests", + "//components/ui/zoom:unit_tests", "//components/url_formatter:unit_tests", "//components/url_matcher:unit_tests", "//components/user_prefs/tracked:unit_tests", + "//components/visitedlink/test:unit_tests", "//components/wallpaper:unit_tests", + "//components/web_cache/browser:unit_tests", "//components/webcrypto:unit_tests", "//components/webdata/common:unit_tests", @@ -648,14 +648,19 @@ test("components_browsertests") { defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] deps = [ - "strings", "//base", "//base/test:test_support", "//testing/gmock", "//testing/gtest", + "strings", ] if (!is_ios) { deps += [ + "//components/tracing", + "//content/test:browsertest_support", + "//content/test:test_support", + "//device/bluetooth", + "//ui/base", "autofill/content/browser", "autofill/content/renderer", "content_settings/core/common", @@ -665,11 +670,6 @@ test("components_browsertests") { "password_manager/content/browser", "password_manager/content/common", "password_manager/content/renderer", - "//components/tracing", - "//content/test:browsertest_support", - "//content/test:test_support", - "//device/bluetooth", - "//ui/base", ] data_deps = [ @@ -697,8 +697,8 @@ test("components_browsertests") { # a MANUAL component_browsertest. sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ] deps += [ - "pref_registry:test_support", "//base:prefs_test_support", + "pref_registry:test_support", ] } @@ -727,8 +727,8 @@ test("components_perftests") { deps += [ "//base", "//base/test:test_support_perf", - "//content/test:test_support", "//components/visitedlink/browser", + "//content/test:test_support", ] } } diff --git a/components/autofill/content/browser/BUILD.gn b/components/autofill/content/browser/BUILD.gn index 36f97605b55f72..05ef2c18b9223e 100644 --- a/components/autofill/content/browser/BUILD.gn +++ b/components/autofill/content/browser/BUILD.gn @@ -78,8 +78,8 @@ source_set("unit_tests") { deps = [ ":browser", "//base", - "//components/autofill/content/common", "//components/autofill/content/browser/wallet:test_support", + "//components/autofill/content/common", "//components/autofill/core/browser", "//components/autofill/core/browser:test_support", "//components/autofill/core/common", diff --git a/components/autofill/content/renderer/BUILD.gn b/components/autofill/content/renderer/BUILD.gn index 3e6888a73e6c30..bb9101a4e27adc 100644 --- a/components/autofill/content/renderer/BUILD.gn +++ b/components/autofill/content/renderer/BUILD.gn @@ -35,8 +35,8 @@ static_library("renderer") { "//ipc", "//net", "//skia", - "//third_party/icu", "//third_party/WebKit/public:blink", + "//third_party/icu", "//ui/base", ] diff --git a/components/autofill/core/browser/BUILD.gn b/components/autofill/core/browser/BUILD.gn index 73c5cb35bb563b..ee20687d22bf00 100644 --- a/components/autofill/core/browser/BUILD.gn +++ b/components/autofill/core/browser/BUILD.gn @@ -157,7 +157,6 @@ source_set("browser") { "//base", "//base:i18n", "//base:prefs", - "//third_party/re2", "//components/autofill/core/common", "//components/compression", "//components/data_use_measurement/core", @@ -181,8 +180,9 @@ source_set("browser") { "//third_party/fips181", "//third_party/icu", "//third_party/libaddressinput:util", - "//third_party/libphonenumber", "//third_party/libjingle", + "//third_party/libphonenumber", + "//third_party/re2", "//ui/base", "//ui/gfx", "//ui/gfx/geometry", @@ -218,10 +218,11 @@ source_set("test_support") { ] deps = [ + ":browser", "//base", - "//base/test:test_support", "//base:prefs", "//base:prefs_test_support", + "//base/test:test_support", "//components/autofill/core/browser", "//components/autofill/core/common", "//components/os_crypt", @@ -233,9 +234,8 @@ source_set("test_support") { "//google_apis:test_support", "//skia", "//testing/gtest", - "//ui/gfx/geometry", "//ui/gfx:test_support", - ":browser", + "//ui/gfx/geometry", ] } @@ -309,8 +309,8 @@ source_set("unit_tests") { "//testing/gmock", "//testing/gtest", "//third_party/libaddressinput:util", - "//third_party/libphonenumber", "//third_party/libjingle", + "//third_party/libphonenumber", "//ui/base", "//url", ] diff --git a/components/autofill/ios/browser/BUILD.gn b/components/autofill/ios/browser/BUILD.gn index 63dcd96c064290..b15bbb14d8f613 100644 --- a/components/autofill/ios/browser/BUILD.gn +++ b/components/autofill/ios/browser/BUILD.gn @@ -23,11 +23,11 @@ source_set("browser") { ] deps = [ + ":injected_js", "//components/autofill/core/browser", "//components/autofill/core/common", "//ios/public/provider/web", "//ios/web", - ":injected_js", ] } diff --git a/components/bitmap_uploader/BUILD.gn b/components/bitmap_uploader/BUILD.gn index 4f48ee20f37dd0..496565c44d3afa 100644 --- a/components/bitmap_uploader/BUILD.gn +++ b/components/bitmap_uploader/BUILD.gn @@ -12,8 +12,8 @@ source_set("bitmap_uploader") { deps = [ "//base", - "//components/mus/public/interfaces", "//components/mus/public/cpp", + "//components/mus/public/interfaces", "//gpu", "//mojo/converters/surfaces", "//mojo/public/c/gles2", diff --git a/components/browser_sync/browser/BUILD.gn b/components/browser_sync/browser/BUILD.gn index e2123ce24f3a7d..bd7cb88df841c7 100644 --- a/components/browser_sync/browser/BUILD.gn +++ b/components/browser_sync/browser/BUILD.gn @@ -27,10 +27,10 @@ source_set("browser") { "//components/pref_registry", "//components/signin/core/browser", "//components/strings", - "//components/syncable_prefs", "//components/sync_bookmarks", "//components/sync_driver", "//components/sync_sessions", + "//components/syncable_prefs", "//components/variations", "//components/version_info", "//components/version_info:generate_version_info", diff --git a/components/cdm/common/BUILD.gn b/components/cdm/common/BUILD.gn index 6ca677cfdca63d..25cd70b42e3878 100644 --- a/components/cdm/common/BUILD.gn +++ b/components/cdm/common/BUILD.gn @@ -12,7 +12,7 @@ source_set("common") { deps = [ "//base", "//content/public/common", - "//media", "//ipc", + "//media", ] } diff --git a/components/chrome_apps/BUILD.gn b/components/chrome_apps/BUILD.gn index a5595001f2ab20..6b7b67ae175bc8 100644 --- a/components/chrome_apps/BUILD.gn +++ b/components/chrome_apps/BUILD.gn @@ -22,8 +22,8 @@ component("chrome_apps") { "chrome_apps_resource_util.h", ] deps = [ - "//base", ":resources", + "//base", ] defines = [ "CHROME_APPS_IMPLEMENTATION" ] } diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn index a868cdd63e11d2..1f9cfb4adf8449 100644 --- a/components/component_updater/BUILD.gn +++ b/components/component_updater/BUILD.gn @@ -44,7 +44,7 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/update_client:test_support", - "//testing/gtest", "//testing/gmock", + "//testing/gtest", ] } diff --git a/components/constrained_window/BUILD.gn b/components/constrained_window/BUILD.gn index 01257f8d8d5cda..8e0952e0763484 100644 --- a/components/constrained_window/BUILD.gn +++ b/components/constrained_window/BUILD.gn @@ -12,8 +12,8 @@ source_set("constrained_window") { deps = [ "//components/guest_view/browser", "//components/web_modal", - "//ui/views", "//skia", + "//ui/views", ] } diff --git a/components/copresence/BUILD.gn b/components/copresence/BUILD.gn index 06d9d534241225..63ddbefddc5047 100644 --- a/components/copresence/BUILD.gn +++ b/components/copresence/BUILD.gn @@ -81,7 +81,7 @@ source_set("unit_tests") { "//components/copresence/proto", "//components/gcm_driver:test_support", "//net:test_support", - "//testing/gtest", "//testing/gmock", + "//testing/gtest", ] } diff --git a/components/crash/content/app/BUILD.gn b/components/crash/content/app/BUILD.gn index 0d84e5e7bb90b5..cc610d6c850f19 100644 --- a/components/crash/content/app/BUILD.gn +++ b/components/crash/content/app/BUILD.gn @@ -115,8 +115,8 @@ source_set("app_non_mac") { if (is_win) { deps += [ - "//sandbox", "//breakpad:breakpad_handler", + "//sandbox", #'../breakpad/breakpad.gyp:breakpad_sender', TODO(GYP) ] diff --git a/components/crash/core/common/BUILD.gn b/components/crash/core/common/BUILD.gn index 07aad2b897aa11..e602f4ede44f15 100644 --- a/components/crash/core/common/BUILD.gn +++ b/components/crash/core/common/BUILD.gn @@ -27,9 +27,9 @@ source_set("unit_tests") { "objc_zombie_unittest.mm", ] deps = [ + ":common", "//base", "//testing/gtest", - ":common", ] } } diff --git a/components/data_reduction_proxy/content/browser/BUILD.gn b/components/data_reduction_proxy/content/browser/BUILD.gn index 9a2650b7614579..fdc5ad960d5c8c 100644 --- a/components/data_reduction_proxy/content/browser/BUILD.gn +++ b/components/data_reduction_proxy/content/browser/BUILD.gn @@ -58,8 +58,8 @@ source_set("unit_tests") { "//content/public/common", "//content/test:test_support", "//net:test_support", - "//testing/gtest", "//testing/gmock", + "//testing/gtest", ] if (is_android) { diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn index e832920977e2e5..c1957fb2f8fd0c 100644 --- a/components/drive/BUILD.gn +++ b/components/drive/BUILD.gn @@ -110,7 +110,6 @@ source_set("drive") { # TODO(lukasza): Remove this dependency (see DEPS file for more info). "//content/public/browser", - "//google_apis:google_apis", "//net:net", "//third_party/cacheinvalidation", diff --git a/components/exo/wayland/BUILD.gn b/components/exo/wayland/BUILD.gn index 2041108cb1d2cd..7b8e434e723d95 100644 --- a/components/exo/wayland/BUILD.gn +++ b/components/exo/wayland/BUILD.gn @@ -28,8 +28,8 @@ source_set("unit_tests") { ] deps = [ + ":wayland", "//testing/gtest", "//third_party/wayland:wayland_client", - ":wayland", ] } diff --git a/components/feedback/BUILD.gn b/components/feedback/BUILD.gn index 022de4af05ad96..f126e0560b6862 100644 --- a/components/feedback/BUILD.gn +++ b/components/feedback/BUILD.gn @@ -28,9 +28,9 @@ source_set("feedback") { deps = [ "//base", - "//components/keyed_service/core", - "//components/keyed_service/content", "//components/feedback/proto", + "//components/keyed_service/content", + "//components/keyed_service/core", "//components/variations/net", "//content/public/browser", "//content/public/common", diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn index 46c35ebf279d5b..65ea0e4864014d 100644 --- a/components/gcm_driver/BUILD.gn +++ b/components/gcm_driver/BUILD.gn @@ -58,7 +58,6 @@ static_library("gcm_driver") { ] deps = [ - "crypto", "//base", "//components/gcm_driver/common", "//components/os_crypt", @@ -67,6 +66,7 @@ static_library("gcm_driver") { "//net", "//sync/protocol", "//url:url", + "crypto", ] if (is_chromeos) { diff --git a/components/gcm_driver/crypto/BUILD.gn b/components/gcm_driver/crypto/BUILD.gn index 95dc4125543c91..d1b7f30c2fd166 100644 --- a/components/gcm_driver/crypto/BUILD.gn +++ b/components/gcm_driver/crypto/BUILD.gn @@ -24,12 +24,12 @@ source_set("crypto") { ] deps = [ - "proto", "//base", + "//components/leveldb_proto", "//crypto", "//crypto:platform", - "//components/leveldb_proto", "//third_party/protobuf:protobuf_lite", + "proto", ] if (use_openssl) { diff --git a/components/gcm_driver/instance_id/BUILD.gn b/components/gcm_driver/instance_id/BUILD.gn index 4b578d30ce2693..4da83de4b78193 100644 --- a/components/gcm_driver/instance_id/BUILD.gn +++ b/components/gcm_driver/instance_id/BUILD.gn @@ -15,8 +15,8 @@ source_set("instance_id") { deps = [ "//base", - "//crypto", "//components/gcm_driver", + "//crypto", ] if (is_android) { diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn index 95d65392f83989..19cfa094800b85 100644 --- a/components/html_viewer/BUILD.gn +++ b/components/html_viewer/BUILD.gn @@ -164,16 +164,16 @@ source_set("lib") { "//components/resource_provider/public/interfaces", "//components/scheduler:scheduler", "//components/startup_metric_utils/browser:lib", - "//components/webcrypto", "//components/web_view:switches", "//components/web_view/public/interfaces", + "//components/webcrypto", "//gin", - "//gpu/command_buffer/common:gles2_utils", "//gpu/blink:blink", + "//gpu/command_buffer/common:gles2_utils", "//media", + "//media:shared_memory_support", "//media/blink", "//media/mojo", - "//media:shared_memory_support", "//mojo/application/public/cpp", "//mojo/application/public/interfaces", "//mojo/common", @@ -190,9 +190,9 @@ source_set("lib") { "//mojo/services/tracing/public/interfaces", "//net", "//skia", - "//third_party/mojo_services/src/accessibility/public/interfaces", "//third_party/WebKit/public:image_resources", "//third_party/WebKit/public:resources", + "//third_party/mojo_services/src/accessibility/public/interfaces", "//ui/base:base", "//ui/events", "//ui/events:gesture_detection", diff --git a/components/login/BUILD.gn b/components/login/BUILD.gn index 8d20888a781a7f..22249304a8c9b8 100644 --- a/components/login/BUILD.gn +++ b/components/login/BUILD.gn @@ -15,8 +15,8 @@ component("login") { defines = [ "LOGIN_IMPLEMENTATION" ] deps = [ - "//ui/base", "//components/signin/core/account_id", + "//ui/base", ] public_deps = [ diff --git a/components/mus/BUILD.gn b/components/mus/BUILD.gn index e89df7ed283b8a..bb2ebe551fdc1d 100644 --- a/components/mus/BUILD.gn +++ b/components/mus/BUILD.gn @@ -18,11 +18,11 @@ if (is_android) { deps = [ ":lib", - "public/interfaces", "//mojo/application/public/cpp:sources", "//mojo/public/cpp/bindings", "//mojo/services/tracing/public/interfaces", "//mojo/shell", + "public/interfaces", ] } } else { diff --git a/components/mus/example/window_type_launcher/BUILD.gn b/components/mus/example/window_type_launcher/BUILD.gn index b3086c13ae6fc2..2602af1f3f142a 100644 --- a/components/mus/example/window_type_launcher/BUILD.gn +++ b/components/mus/example/window_type_launcher/BUILD.gn @@ -28,8 +28,8 @@ executable("window_type_launcher") { "//mojo/converters/geometry", "//mojo/message_pump", "//mojo/public/cpp/bindings", - "//mojo/runner/child:lib", "//mojo/runner:init", + "//mojo/runner/child:lib", "//skia", "//third_party/mojo/src/mojo/edk/system", "//ui/aura", diff --git a/components/mus/public/interfaces/BUILD.gn b/components/mus/public/interfaces/BUILD.gn index 02ef8b5f7231b5..899401a9c07f7e 100644 --- a/components/mus/public/interfaces/BUILD.gn +++ b/components/mus/public/interfaces/BUILD.gn @@ -29,7 +29,7 @@ mojom("interfaces") { ] deps = [ - "//ui/mojo/ime:interfaces", "//ui/mojo/geometry:interfaces", + "//ui/mojo/ime:interfaces", ] } diff --git a/components/mus/ws/BUILD.gn b/components/mus/ws/BUILD.gn index e7f92231961bbf..63fb2e842c0e8d 100644 --- a/components/mus/ws/BUILD.gn +++ b/components/mus/ws/BUILD.gn @@ -127,14 +127,14 @@ test("window_manager_unittests") { ] deps = [ - ":test_support", ":lib", + ":test_support", "//base", "//base/test:test_config", "//components/mus/common", - "//components/mus/surfaces", "//components/mus/public/cpp", "//components/mus/public/interfaces", + "//components/mus/surfaces", "//mojo/application/public/interfaces", "//mojo/converters/geometry", "//mojo/converters/input_events", @@ -143,13 +143,13 @@ test("window_manager_unittests") { "//mojo/gles2", "//mojo/platform_handle", "//mojo/public/cpp/bindings:bindings", - "//third_party/mojo/src/mojo/edk/test:run_all_unittests", - "//ui/mojo/geometry:interfaces", "//testing/gtest", + "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//ui/events", "//ui/gfx", "//ui/gfx:test_support", "//ui/gfx/geometry", + "//ui/mojo/geometry:interfaces", ] if (!is_android) { # TODO(GYP) Enable on Android when osmesa links. diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn index 35c892ea0d2b8e..7658660423ab87 100644 --- a/components/nacl/BUILD.gn +++ b/components/nacl/BUILD.gn @@ -144,7 +144,6 @@ if (enable_nacl) { deps = [ ":nacl_common", ":nacl_switches", - "renderer/plugin:nacl_trusted_plugin", "//base", "//content/public/common", "//content/public/renderer", @@ -154,6 +153,7 @@ if (enable_nacl) { "//ppapi/proxy:ipc", "//ppapi/shared_impl", "//third_party/WebKit/public:blink", + "renderer/plugin:nacl_trusted_plugin", ] } @@ -259,8 +259,8 @@ if (enable_nacl) { "loader/nonsfi/nonsfi_main.h", ] deps = [ - ":nacl_switches", ":nacl_helper_nonsfi_sandbox", + ":nacl_switches", "//base", "//components/tracing", "//content", diff --git a/components/net_log/BUILD.gn b/components/net_log/BUILD.gn index b2af91e2b2450a..8bdc1617c29389 100644 --- a/components/net_log/BUILD.gn +++ b/components/net_log/BUILD.gn @@ -26,9 +26,9 @@ source_set("unit_tests") { "net_log_temp_file_unittest.cc", ] deps = [ + ":net_log", "//base", "//net", "//testing/gtest", - ":net_log", ] } diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn index b1984fd3f5af05..e9e926d05e2f57 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -107,6 +107,7 @@ source_set("browser") { "//components/metrics/proto", ] deps = [ + ":in_memory_url_index_cache_proto", "//base", "//base:i18n", "//base:prefs", @@ -135,7 +136,6 @@ source_set("browser") { "//ui/base", "//ui/gfx", "//url", - ":in_memory_url_index_cache_proto", ] } @@ -192,6 +192,8 @@ source_set("unit_tests") { ] deps = [ + ":browser", + ":test_support", "//base", "//components/open_from_clipboard:test_support", "//components/search", @@ -200,7 +202,5 @@ source_set("unit_tests") { "//testing/gmock", "//testing/gtest", "//url", - ":browser", - ":test_support", ] } diff --git a/components/ownership/BUILD.gn b/components/ownership/BUILD.gn index eb65f21cae0913..f65556594eed82 100644 --- a/components/ownership/BUILD.gn +++ b/components/ownership/BUILD.gn @@ -23,8 +23,8 @@ if (is_chromeos) { deps = [ "//base", "//components/keyed_service/core", - "//components/policy/proto", "//components/policy:policy_component_common", + "//components/policy/proto", "//crypto", ] diff --git a/components/pairing/BUILD.gn b/components/pairing/BUILD.gn index 12096c8e0547aa..dfbe94e0672e4d 100644 --- a/components/pairing/BUILD.gn +++ b/components/pairing/BUILD.gn @@ -29,10 +29,10 @@ source_set("pairing") { ] deps = [ + ":proto", "//base", "//device/bluetooth", "//net", - ":proto", ] } diff --git a/components/password_manager/sync/browser/BUILD.gn b/components/password_manager/sync/browser/BUILD.gn index f5a0e9ba07aaea..3ccf7f332b9441 100644 --- a/components/password_manager/sync/browser/BUILD.gn +++ b/components/password_manager/sync/browser/BUILD.gn @@ -18,11 +18,11 @@ source_set("browser") { deps = [ "//base", - "//google_apis", "//components/autofill/core/common", "//components/password_manager/core/browser", "//components/signin/core/browser", "//components/sync_driver", + "//google_apis", "//net", "//url", ] @@ -38,6 +38,7 @@ source_set("unit_tests") { "sync_username_test_base.h", ] deps = [ + ":browser", "//components/pref_registry", "//components/signin/core/common", "//components/sync_driver:test_support", @@ -46,6 +47,5 @@ source_set("unit_tests") { "//sync", "//testing/gmock", "//testing/gtest", - ":browser", ] } diff --git a/components/pdf/renderer/BUILD.gn b/components/pdf/renderer/BUILD.gn index 966ba98beeb61c..5b4c2f705dffca 100644 --- a/components/pdf/renderer/BUILD.gn +++ b/components/pdf/renderer/BUILD.gn @@ -22,8 +22,8 @@ static_library("renderer") { "//content/public/renderer", "//gin", "//ppapi/shared_impl", + "//third_party/WebKit/public:blink", "//third_party/icu", "//v8", - "//third_party/WebKit/public:blink", ] } diff --git a/components/pdf_viewer/BUILD.gn b/components/pdf_viewer/BUILD.gn index 984b212b37eccc..fc565e625b0b3f 100644 --- a/components/pdf_viewer/BUILD.gn +++ b/components/pdf_viewer/BUILD.gn @@ -14,8 +14,8 @@ mojo_native_application("pdf_viewer") { deps = [ "//base", "//components/bitmap_uploader", - "//components/mus/public/interfaces", "//components/mus/public/cpp", + "//components/mus/public/interfaces", "//components/web_view/public/interfaces", "//gpu", "//mojo/application/public/cpp", diff --git a/components/policy/android/BUILD.gn b/components/policy/android/BUILD.gn index ab1003b43d317b..7399ba209fce34 100644 --- a/components/policy/android/BUILD.gn +++ b/components/policy/android/BUILD.gn @@ -26,9 +26,9 @@ android_library("policy_java") { android_library("policy_java_test_support") { testonly = true deps = [ + ":policy_java", "//base:base_java", "//base:base_java_test_support", - ":policy_java", ] java_files = [ "javatests/src/org/chromium/policy/test/annotations/Policies.java", @@ -51,8 +51,8 @@ junit_binary("components_policy_junit_tests") { "junit/src/org/chromium/policy/test/annotations/PoliciesTest.java", ] deps = [ - ":policy_java_test_support", ":policy_java", + ":policy_java_test_support", "//base:base_java", "//third_party/junit:hamcrest", ] diff --git a/components/precache/android/BUILD.gn b/components/precache/android/BUILD.gn index 537150b533b654..7deabcd9239611 100644 --- a/components/precache/android/BUILD.gn +++ b/components/precache/android/BUILD.gn @@ -14,8 +14,8 @@ android_library("precache_java") { android_library("precache_javatests") { deps = [ - "//base:base_java_test_support", ":precache_java", + "//base:base_java_test_support", ] DEPRECATED_java_in_dir = "javatests/src" } diff --git a/components/proximity_auth/ble/BUILD.gn b/components/proximity_auth/ble/BUILD.gn index 3fd1b688a9437b..5f204fb1322dea 100644 --- a/components/proximity_auth/ble/BUILD.gn +++ b/components/proximity_auth/ble/BUILD.gn @@ -46,8 +46,8 @@ source_set("unit_tests") { deps = [ ":ble", - "//components/proximity_auth", "//base/test:test_support", + "//components/proximity_auth", "//device/bluetooth:mocks", "//testing/gmock", "//testing/gtest", diff --git a/components/renderer_context_menu/BUILD.gn b/components/renderer_context_menu/BUILD.gn index 21b4e061992b7b..912888cb831da1 100644 --- a/components/renderer_context_menu/BUILD.gn +++ b/components/renderer_context_menu/BUILD.gn @@ -26,8 +26,8 @@ static_library("renderer_context_menu") { deps = [ "//base", - "//content/public/browser", "//components/search_engines", + "//content/public/browser", "//third_party/WebKit/public:blink_headers", ] } diff --git a/components/rlz/BUILD.gn b/components/rlz/BUILD.gn index dad456eea25751..72e0efb6ab578a 100644 --- a/components/rlz/BUILD.gn +++ b/components/rlz/BUILD.gn @@ -32,9 +32,9 @@ source_set("unit_tests") { ] deps = [ + ":rlz", "//net:test_support", "//rlz:test_support", "//ui/base", - ":rlz", ] } diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn index 3176fc617bcad7..9740b889487a00 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn @@ -60,8 +60,8 @@ static_library("search_engines") { "//components/metrics/proto", "//components/pref_registry", "//components/rappor", - "//components/sync_driver", "//components/strings", + "//components/sync_driver", "//components/url_formatter", "//components/webdata/common", "//google_apis", @@ -114,8 +114,8 @@ source_set("unit_tests") { } deps = [ - "//components/pref_registry:test_support", ":test_support", + "//components/pref_registry:test_support", "//testing/gmock", "//testing/gtest", ] diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn index d27e72736e7449..3a3052250e3d59 100644 --- a/components/signin/core/browser/BUILD.gn +++ b/components/signin/core/browser/BUILD.gn @@ -68,12 +68,6 @@ source_set("browser") { deps = [ "//base", - "//crypto", - "//google_apis", - "//net", - "//sql", - "//third_party/icu", - "//components/signin/core/common", "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/google/core/browser", @@ -81,8 +75,14 @@ source_set("browser") { "//components/keyed_service/core", "//components/metrics", "//components/os_crypt", - "//components/webdata/common", "//components/signin/core/account_id", + "//components/signin/core/common", + "//components/webdata/common", + "//crypto", + "//google_apis", + "//net", + "//sql", + "//third_party/icu", ] if (is_chromeos) { diff --git a/components/sync_driver/BUILD.gn b/components/sync_driver/BUILD.gn index 67bc4e89dcf021..ffe41b8b23f1dc 100644 --- a/components/sync_driver/BUILD.gn +++ b/components/sync_driver/BUILD.gn @@ -235,8 +235,8 @@ source_set("unit_tests") { "//components/pref_registry:test_support", "//components/version_info", "//net:test_support", - "//sync:test_support_sync_internal_api", "//sync:test_support_sync_api", + "//sync:test_support_sync_internal_api", "//testing/gmock", "//testing/gtest", "//url", diff --git a/components/sync_sessions/BUILD.gn b/components/sync_sessions/BUILD.gn index cffd15aaa04d0b..3f6ceb85f22782 100644 --- a/components/sync_sessions/BUILD.gn +++ b/components/sync_sessions/BUILD.gn @@ -100,15 +100,15 @@ source_set("unit_tests") { "//base:prefs", "//base:prefs_test_support", "//base/test:test_support", - "//testing/gmock", "//components/bookmarks/browser", "//components/history/core/browser", "//components/sessions:test_support", "//components/sync_driver", "//components/sync_driver:test_support", - "//testing/gtest", "//sync", "//sync:test_support_sync_api", + "//testing/gmock", + "//testing/gtest", "//ui/base:base", "//url", ] diff --git a/components/syncable_prefs/BUILD.gn b/components/syncable_prefs/BUILD.gn index 4706b6fbf6874b..c854abbbf3f7d4 100644 --- a/components/syncable_prefs/BUILD.gn +++ b/components/syncable_prefs/BUILD.gn @@ -64,7 +64,7 @@ source_set("unit_tests") { ":test_support", "//base:prefs", "//components/pref_registry", - "//testing/gtest", "//sync:test_support_sync_api", + "//testing/gtest", ] } diff --git a/components/translate/ios/browser/BUILD.gn b/components/translate/ios/browser/BUILD.gn index 420954ac4f7c8f..9554190bb418eb 100644 --- a/components/translate/ios/browser/BUILD.gn +++ b/components/translate/ios/browser/BUILD.gn @@ -19,13 +19,13 @@ source_set("browser") { ] deps = [ + ":injected_js", "//base", "//components/translate/core/browser", "//components/translate/core/common", "//components/translate/core/language_detection", "//ios/web", "//url", - ":injected_js", ] } @@ -46,6 +46,7 @@ source_set("unit_tests") { ] deps = [ + ":browser", "//base", "//components/resources", "//components/translate/core/common", @@ -54,6 +55,5 @@ source_set("unit_tests") { "//third_party/ocmock", "//ui/base", "//url", - ":browser", ] } diff --git a/components/update_client/BUILD.gn b/components/update_client/BUILD.gn index eeefaea8bc3525..32722d0ccbc167 100644 --- a/components/update_client/BUILD.gn +++ b/components/update_client/BUILD.gn @@ -55,9 +55,9 @@ source_set("update_client") { "//components/crx_file", "//courgette:courgette_lib", "//crypto", + "//net", "//third_party/libxml", "//third_party/zlib:zip", - "//net", "//ui/base", "//url", ] @@ -80,8 +80,8 @@ source_set("test_support") { deps = [ "//base", "//net:test_support", - "//testing/gtest", "//testing/gmock", + "//testing/gtest", "//url", ] } @@ -100,13 +100,13 @@ source_set("unit_tests") { ] deps = [ - ":update_client", ":test_support", + ":update_client", "//base", "//courgette:courgette_lib", "//net:test_support", - "//testing/gtest", "//testing/gmock", + "//testing/gtest", "//third_party/libxml", ] } diff --git a/components/url_formatter/BUILD.gn b/components/url_formatter/BUILD.gn index b74ef78db67a24..1756f02477c5f2 100644 --- a/components/url_formatter/BUILD.gn +++ b/components/url_formatter/BUILD.gn @@ -19,8 +19,8 @@ source_set("url_formatter") { deps = [ "//base", - "//third_party/icu", "//net", + "//third_party/icu", "//url", ] diff --git a/components/user_prefs/tracked/BUILD.gn b/components/user_prefs/tracked/BUILD.gn index e749217357d13d..8c32ec7bb24d5a 100644 --- a/components/user_prefs/tracked/BUILD.gn +++ b/components/user_prefs/tracked/BUILD.gn @@ -53,8 +53,8 @@ static_library("user_prefs_tracked") { deps = [ "//base:base", "//base:prefs", - "//crypto:crypto", "//components/pref_registry", + "//crypto:crypto", ] } diff --git a/components/variations/BUILD.gn b/components/variations/BUILD.gn index a65148ae55af9d..3f9c7c7d8787af 100644 --- a/components/variations/BUILD.gn +++ b/components/variations/BUILD.gn @@ -62,7 +62,6 @@ source_set("variations") { } deps = [ - "proto", "//base", "//base:prefs", "//components/compression", @@ -70,6 +69,7 @@ source_set("variations") { "//crypto", "//third_party/mt19937ar", "//third_party/protobuf:protobuf_lite", + "proto", ] if (is_android) { @@ -111,11 +111,11 @@ source_set("unit_tests") { deps = [ ":variations", - "net", - "proto", "//base:prefs_test_support", "//base/test:test_support", "//components/compression", "//testing/gtest", + "net", + "proto", ] } diff --git a/components/variations/service/generate_ui_string_overrider.gni b/components/variations/service/generate_ui_string_overrider.gni index 4b16c52e333d77..14497f9ae44db9 100644 --- a/components/variations/service/generate_ui_string_overrider.gni +++ b/components/variations/service/generate_ui_string_overrider.gni @@ -62,8 +62,8 @@ template("generate_ui_string_overrider") { source_set(target_name) { sources = get_target_outputs(":$gen_action_target_name") deps = [ - "//components/variations/service", ":$gen_action_target_name", + "//components/variations/service", ] forward_variables_from(invoker, [ "visibility" ]) diff --git a/components/version_info/BUILD.gn b/components/version_info/BUILD.gn index 1f08c3f26d0fef..7f51c0a4376fa2 100644 --- a/components/version_info/BUILD.gn +++ b/components/version_info/BUILD.gn @@ -22,9 +22,9 @@ source_set("version_info") { ] deps = [ + ":generate_version_info", "//base", "//components/strings", - ":generate_version_info", ] if (use_unofficial_version_number) { diff --git a/components/web_contents_delegate_android/BUILD.gn b/components/web_contents_delegate_android/BUILD.gn index 56ee8de191b4ef..24bc34e5b19374 100644 --- a/components/web_contents_delegate_android/BUILD.gn +++ b/components/web_contents_delegate_android/BUILD.gn @@ -42,9 +42,9 @@ android_library("web_contents_delegate_android_java") { deps = [ ":web_contents_delegate_android_java_resources", "//base:base_java", - "//ui/android:ui_java", "//content/public/android:content_java", "//content/public/android:content_java_resources", + "//ui/android:ui_java", ] DEPRECATED_java_in_dir = "android/java/src" } diff --git a/components/web_resource/BUILD.gn b/components/web_resource/BUILD.gn index 4b24750a8b621c..6c396d97a5d2bf 100644 --- a/components/web_resource/BUILD.gn +++ b/components/web_resource/BUILD.gn @@ -63,8 +63,8 @@ source_set("unit_tests") { } deps = [ - ":web_resource", ":test_support", + ":web_resource", "//base", "//base:prefs_test_support", "//components/version_info", diff --git a/components/web_view/BUILD.gn b/components/web_view/BUILD.gn index 569cc4bd64e41a..b22822085f6ccc 100644 --- a/components/web_view/BUILD.gn +++ b/components/web_view/BUILD.gn @@ -119,9 +119,9 @@ mojo_native_application("apptests") { ":test_support", "//base", "//base/test:test_config", + "//components/mus/public/cpp", "//components/mus/public/cpp/tests:test_support", "//components/mus/public/interfaces", - "//components/mus/public/cpp", "//components/web_view/public/cpp", "//components/web_view/public/interfaces", "//mojo/application/public/cpp:sources", diff --git a/components/web_view/public/interfaces/BUILD.gn b/components/web_view/public/interfaces/BUILD.gn index 6ce73b514e48fc..5ddf39d8f513d2 100644 --- a/components/web_view/public/interfaces/BUILD.gn +++ b/components/web_view/public/interfaces/BUILD.gn @@ -10,9 +10,7 @@ mojom("interfaces") { "web_view.mojom", ] - import_dirs = [ - "//mojo/services" - ] + import_dirs = [ "//mojo/services" ] deps = [ "//components/mus/public/interfaces", diff --git a/components/webcrypto/BUILD.gn b/components/webcrypto/BUILD.gn index aef7867b183060..ce980926175f79 100644 --- a/components/webcrypto/BUILD.gn +++ b/components/webcrypto/BUILD.gn @@ -87,8 +87,8 @@ source_set("unit_tests") { "//components/test_runner:test_runner", "//crypto", "//crypto:platform", - "//testing/perf", "//testing/gtest", + "//testing/perf", "//third_party/WebKit/public:blink", "//third_party/re2", ] diff --git a/components/webp_transcode/BUILD.gn b/components/webp_transcode/BUILD.gn index 2e15974db0b60c..f62f6913e2c751 100644 --- a/components/webp_transcode/BUILD.gn +++ b/components/webp_transcode/BUILD.gn @@ -28,11 +28,11 @@ source_set("unit_tests") { ] deps = [ + ":webp_transcode", "//base", "//net", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", - ":webp_transcode", ] } diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn index 32b6e03ef49605..ed12ee6fde3c9d 100644 --- a/content/plugin/BUILD.gn +++ b/content/plugin/BUILD.gn @@ -35,8 +35,8 @@ if (enable_plugins && !is_linux) { "//content/public/common:common_sources", "//mojo/application/public/interfaces", "//skia", - "//third_party/npapi", "//third_party/WebKit/public:blink", + "//third_party/npapi", ] } } else { diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn index ef4dcdf5976eb4..f5fc1257d07e7d 100644 --- a/content/ppapi_plugin/BUILD.gn +++ b/content/ppapi_plugin/BUILD.gn @@ -42,8 +42,8 @@ source_set("ppapi_plugin_sources") { "//mojo/application/public/interfaces", "//ppapi/proxy:ipc", "//skia", - "//third_party/icu", "//third_party/WebKit/public:blink", + "//third_party/icu", "//ui/base", "//ui/gfx", "//ui/gfx/geometry", diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index 0d447ce208cf5f..bea70b9e53b3dc 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -32,22 +32,22 @@ android_library("content_java") { deps = [ ":content_java_resources", "//base:base_java", - "//device/battery/android:battery_monitor_android", "//device/battery:mojo_bindings_java", + "//device/battery/android:battery_monitor_android", "//device/bluetooth:java", - "//device/vibration/android:vibration_manager_android", "//device/vibration:mojo_bindings_java", + "//device/vibration/android:vibration_manager_android", "//media/base/android:media_java", "//media/midi:midi_java", "//mojo/android:system_java", "//mojo/public/java:bindings", "//mojo/public/java:system", "//net/android:net_java", + "//third_party/WebKit/public:blink_headers_java", "//third_party/android_tools:android_support_v13_java", + "//third_party/jsr-305:jsr_305_javalib", "//ui/accessibility:ui_accessibility_java", "//ui/android:ui_java", - "//third_party/jsr-305:jsr_305_javalib", - "//third_party/WebKit/public:blink_headers_java", #"//content:content_common", ] @@ -165,15 +165,16 @@ group("jni") { android_library("content_javatests") { testonly = true deps = [ + ":content_java", "//base:base_java", "//base:base_java_test_support", "//content/public/test/android:content_java_test_support", + "//content/shell/android:content_shell_apk_java", "//content/shell/android:content_shell_java", "//content/shell/android:content_shell_java_resources", - "//content/shell/android:content_shell_apk_java", "//content/shell/android:content_shell_test_java", - "//device/vibration/android:vibration_manager_android", "//device/vibration:mojo_bindings_java", + "//device/vibration/android:vibration_manager_android", "//media/base/android:media_java", "//mojo/android:system_java", "//mojo/public/interfaces/bindings/tests:test_interfaces_java", @@ -184,7 +185,6 @@ android_library("content_javatests") { "//third_party/android_tools:android_support_v13_java", "//third_party/android_tools:legacy_http_javalib", "//ui/android:ui_java", - ":content_java", ] DEPRECATED_java_in_dir = "javatests/src" diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn index 0ab2d33a7ff8c5..719eadf6771980 100644 --- a/content/public/renderer/BUILD.gn +++ b/content/public/renderer/BUILD.gn @@ -31,8 +31,8 @@ source_set("renderer_sources") { "//content/public/common:common_sources", "//content/renderer", "//skia", - "//third_party/libjingle", "//third_party/WebKit/public:blink_headers", + "//third_party/libjingle", "//third_party/widevine/cdm:version_h", "//ui/gfx", "//v8", diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index cf164b7ca8625d..aa203aa23d93ec 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -24,7 +24,6 @@ source_set("renderer") { deps = [ # TODO(GYP) bug 376846 remove this. This should be inherited from //net but # those don't cross component boundaries. - "//crypto:platform", "//base/allocator", "//cc", "//cc/blink", @@ -38,6 +37,7 @@ source_set("renderer") { "//content/public/child:child_sources", "//content/public/common:common_sources", "//content/public/common:mojo_bindings", + "//crypto:platform", "//device/battery:mojo_bindings", "//device/vibration:mojo_bindings", "//gin", @@ -47,26 +47,26 @@ source_set("renderer") { "//media", "//media/blink", "//mojo/application/public/interfaces", - "//mojo/environment:chromium", "//mojo/common:url_type_converters", "//mojo/converters/geometry", + "//mojo/environment:chromium", "//mojo/public/cpp/bindings", "//mojo/public/js", "//net", "//skia", "//skia/public", "//storage/common", + "//third_party/WebKit/public:blink", "//third_party/icu", "//third_party/libjingle", "//third_party/libyuv", "//third_party/mojo/src/mojo/edk/js", "//third_party/npapi", - "//third_party/WebKit/public:blink", "//third_party/widevine/cdm:version_h", "//ui/accessibility", "//ui/base", - "//ui/events:events_base", "//ui/events:dom_keycode_converter", + "//ui/events:events_base", "//ui/gl", "//ui/native_theme", "//ui/surface", diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 38a917ffe4d564..1e567e16ee9990 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -288,9 +288,9 @@ static_library("content_shell_lib") { sources += [ "browser/shell_views.cc" ] deps += [ "//ui/resources", - "//ui/views/controls/webview", "//ui/views", "//ui/views:test_support", + "//ui/views/controls/webview", ] } else { sources += [ "browser/shell_aura.cc" ] diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn index 756416dc5b4261..bbffa7387f5ebf 100644 --- a/content/shell/android/BUILD.gn +++ b/content/shell/android/BUILD.gn @@ -22,11 +22,11 @@ shared_library("libcontent_shell_content_view") { deps = [ ":content_shell_jni_headers", "//build/config/sanitizers:deps", + "//components/crash/content/browser", "//content/shell:content_shell_lib", "//content/shell:pak", - "//components/crash/content/browser", - "//skia", "//media/base/android", + "//skia", ] sources = [ "shell_library_loader.cc", @@ -42,13 +42,13 @@ android_resources("content_shell_java_resources") { android_library("content_shell_java") { testonly = true deps = [ + ":content_shell_java_resources", "//base:base_java", "//content/public/android:content_java", "//media/base/android:media_java", "//mojo/public/java:system", "//net/android:net_java", "//ui/android:ui_java", - ":content_shell_java_resources", ] DEPRECATED_java_in_dir = "java/src" } @@ -126,21 +126,21 @@ android_apk("content_shell_apk") { android_library("content_shell_test_java") { testonly = true deps = [ - ":content_shell_java", ":content_shell_apk_java", + ":content_shell_java", "//base:base_java", "//base:base_java_test_support", + "//content/public/android:content_java", "//content/public/test/android:content_java_test_support", "//content/shell/android:content_shell_java", - "//content/public/android:content_java", ] DEPRECATED_java_in_dir = "javatests/src" } instrumentation_test_apk("content_shell_test_apk") { deps = [ - "//content/public/android:content_javatests", "//base:base_javatests", + "//content/public/android:content_javatests", "//net/android:net_javatests", ] data_deps = [ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 2e07dedecb9090..ec2bfcafc5c026 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -43,12 +43,12 @@ source_set("test_support") { "//testing/gtest", "//ui/accessibility:ax_gen", "//ui/base", - "//ui/base/ime", "//ui/base:test_support", + "//ui/base/ime", "//ui/events:dom_keycode_converter", "//ui/events:events_base", - "//ui/events:test_support", "//ui/events:gesture_detection", + "//ui/events:test_support", "//ui/gfx:test_support", "//ui/gl", "//ui/gl:test_support", @@ -65,17 +65,17 @@ source_set("test_support") { public_deps += [ "//third_party/WebKit/public:blink" ] deps += [ ":content_test_mojo_bindings", + "//cc", + "//cc:test_support", "//components/scheduler:scheduler", "//components/scheduler:test_support", "//content/browser/speech/proto", - "//content/public/child", "//content/gpu", + "//content/public/child", "//content/public/plugin", "//content/public/renderer", "//content/public/utility", "//content/shell:pak", - "//cc", - "//cc:test_support", "//ipc/mojo", "//media", "//mojo/application/public/cpp:cpp_for_chromium", @@ -134,8 +134,8 @@ source_set("test_support") { if (use_aura || is_mac) { deps += [ - "//ui/compositor", "//third_party/libvpx_new", + "//ui/compositor", ] sources += [ @@ -243,8 +243,8 @@ if (!is_ios) { "//components/test_runner:test_runner", "//content/public/common", "//skia", - "//v8", "//ui/accessibility:ax_gen", + "//v8", ] if (is_android) { @@ -356,13 +356,13 @@ test("content_browsertests") { ":web_ui_test_mojo_bindings", "//base/allocator", "//base/test:test_support", + "//content:resources", "//content/browser/background_sync:background_sync_proto", "//content/common:mojo_bindings", "//content/gpu", "//content/public/common", "//content/public/plugin", "//content/public/renderer", - "//content:resources", "//content/shell:content_shell_lib", "//content/shell:pak", "//content/test:test_support", @@ -372,10 +372,10 @@ test("content_browsertests") { "//gin", "//gpu", "//ipc:test_support", + "//media:shared_memory_support", "//media:test_support", "//media/audio:test_support", "//media/base:test_support", - "//media:shared_memory_support", "//mojo/application/public/cpp:cpp_for_chromium", "//mojo/environment:chromium", "//mojo/public/cpp/bindings", @@ -386,13 +386,13 @@ test("content_browsertests") { "//ppapi/proxy", "//ppapi/proxy:ipc", "//ppapi/shared_impl", - "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/edk/test:test_support", "//testing/gmock", "//testing/gtest", "//third_party/WebKit/public:blink", "//third_party/leveldatabase", "//third_party/mesa:osmesa", + "//third_party/mojo/src/mojo/edk/system", + "//third_party/mojo/src/mojo/edk/test:test_support", "//third_party/zlib", "//ui/accessibility", "//ui/accessibility:ax_gen", @@ -443,8 +443,8 @@ test("content_browsertests") { [ "../browser/battery_status/battery_monitor_impl_browsertest.cc" ] deps -= [ "//device/battery" ] deps += [ - "//content/shell/android:content_shell_jni_headers", "//content/shell:content_shell_lib", + "//content/shell/android:content_shell_jni_headers", "//testing/android/native_test:native_test_support", ] apk_deps = [ @@ -549,9 +549,7 @@ test("content_unittests") { } } - configs += [ - "//build/config:precompiled_headers", - ] + configs += [ "//build/config:precompiled_headers" ] deps = [ ":test_support", @@ -604,8 +602,8 @@ test("content_unittests") { "//gpu", "//gpu:test_support", "//ipc:test_support", - "//media:test_support", "//media:shared_memory_support", + "//media:test_support", "//media/audio:test_support", "//media/base:test_support", "//media/midi:midi", @@ -782,10 +780,10 @@ test("content_perftests") { deps = [ "//base/allocator", "//base/test:test_support", + "//cc", "//content/public/browser", "//content/public/common", "//content/test:test_support", - "//cc", "//skia", "//testing/gtest", "//testing/perf", diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn index 82c266f7e5775c..666e1e3d577c24 100644 --- a/device/bluetooth/BUILD.gn +++ b/device/bluetooth/BUILD.gn @@ -114,12 +114,12 @@ component("bluetooth") { all_dependent_configs = [ ":bluetooth_config" ] deps = [ - "strings", - "uribeacon", "//base", "//crypto", "//net", "//ui/base", + "strings", + "uribeacon", ] if (is_android) { diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn index a139092be7f1d5..6d17f7df5d36e1 100644 --- a/device/usb/BUILD.gn +++ b/device/usb/BUILD.gn @@ -84,9 +84,9 @@ source_set("mocks") { ] deps = [ + ":usb", "//base", "//testing/gmock", - ":usb", ] } diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 9aa1ca3ebbce90..1a86e84782aceb 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -342,13 +342,13 @@ source_set("chrome_extensions_browsertests") { "//testing/gmock", "//testing/gtest", "//testing/perf", + "//third_party/WebKit/public:blink", "//third_party/cacheinvalidation", "//third_party/icu", "//third_party/leveldatabase", "//third_party/libaddressinput", "//third_party/libjingle", "//third_party/safe_browsing:test_support", - "//third_party/WebKit/public:blink", "//third_party/webrtc/modules/desktop_capture", "//third_party/widevine/cdm:version_h", "//ui/accessibility:test_support", diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn index a62d1d0c98301f..4f5496ad9f0c87 100644 --- a/extensions/common/BUILD.gn +++ b/extensions/common/BUILD.gn @@ -56,9 +56,9 @@ if (enable_extensions) { "//crypto", "//device/bluetooth", "//device/usb", + "//extensions:extensions_resources", "//extensions/common/api", "//extensions/strings", - "//extensions:extensions_resources", "//ipc", "//net", "//third_party/boringssl", diff --git a/extensions/common/api/BUILD.gn b/extensions/common/api/BUILD.gn index 0cbce18b836e46..5f259ecae8aeae 100644 --- a/extensions/common/api/BUILD.gn +++ b/extensions/common/api/BUILD.gn @@ -26,8 +26,8 @@ mojom("mojom") { # GYP version: extensions/common/api/api.gyp:extensions_api group("api") { public_deps = [ - ":mojom", ":generated_api", + ":mojom", ] } diff --git a/extensions/components/native_app_window/BUILD.gn b/extensions/components/native_app_window/BUILD.gn index 28330bc6544f2d..5136e2a008b313 100644 --- a/extensions/components/native_app_window/BUILD.gn +++ b/extensions/components/native_app_window/BUILD.gn @@ -10,11 +10,11 @@ static_library("native_app_window") { deps = [ "//base", - "//skia", - "//ui/views", - "//ui/views/controls/webview", "//content/public/browser", "//extensions/browser", "//extensions/common", + "//skia", + "//ui/views", + "//ui/views/controls/webview", ] } diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index 0e318979efef49..829ef006f7faee 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -44,16 +44,16 @@ source_set("app_shell_lib") { "//content/shell:content_shell_lib", "//device/core", "//device/hid", - "//extensions/common/api", - "//extensions/common/api:api_registration", + "//extensions:extensions_resources", + "//extensions:shell_and_test_pak", "//extensions/browser", "//extensions/common", + "//extensions/common/api", + "//extensions/common/api:api_registration", "//extensions/renderer", "//extensions/shell/common/api", "//extensions/shell/common/api:api_registration", "//extensions/utility", - "//extensions:extensions_resources", - "//extensions:shell_and_test_pak", "//mojo/environment:chromium", "//skia", "//third_party/WebKit/public:blink", diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index 141b2b2b13ab00..8244ec63575a2c 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -160,6 +160,9 @@ test("gl_tests") { "//base", "//base/test:test_support", "//base/third_party/dynamic_annotations", + "//gpu/command_buffer/client:gles2_c_lib", + "//gpu/command_buffer/client:gles2_implementation", + "//gpu/command_buffer/common:gles2_utils", "//testing/gmock", "//testing/gtest", "//third_party/angle:translator", @@ -167,9 +170,6 @@ test("gl_tests") { "//ui/gfx:test_support", "//ui/gfx/geometry", "//ui/gl", - "//gpu/command_buffer/common:gles2_utils", - "//gpu/command_buffer/client:gles2_c_lib", - "//gpu/command_buffer/client:gles2_implementation", ] libs = [] @@ -299,18 +299,18 @@ test("gpu_unittests") { "//base", "//base/test:test_support", "//base/third_party/dynamic_annotations", + "//gpu/command_buffer/client:gles2_c_lib", + "//gpu/command_buffer/client:gles2_implementation", + "//gpu/command_buffer/common:gles2_utils", "//testing/gmock", "//testing/gtest", "//third_party/angle:translator", "//ui/gfx", - "//ui/gfx/geometry", "//ui/gfx:test_support", + "//ui/gfx/geometry", "//ui/gl", "//ui/gl:gl_unittest_utils", "//ui/gl:test_support", - "//gpu/command_buffer/common:gles2_utils", - "//gpu/command_buffer/client:gles2_c_lib", - "//gpu/command_buffer/client:gles2_implementation", ] } diff --git a/gpu/blink/BUILD.gn b/gpu/blink/BUILD.gn index d034c4769b6acc..8bb98b1188c679 100644 --- a/gpu/blink/BUILD.gn +++ b/gpu/blink/BUILD.gn @@ -23,18 +23,18 @@ component("blink") { "//base", "//base/third_party/dynamic_annotations", "//cc", + "//gpu/command_buffer/client:gl_in_process_context", + "//gpu/command_buffer/client:gles2_c_lib", + "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/common", "//gpu/command_buffer/common:gles2_utils", "//gpu/command_buffer/service", - "//gpu/command_buffer/client:gles2_c_lib", - "//gpu/command_buffer/client:gles2_implementation", - "//gpu/command_buffer/client:gl_in_process_context", "//gpu/skia_bindings", "//skia", "//third_party/WebKit/public:blink_minimal", "//third_party/angle:translator", - "//ui/gl", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gl", ] } diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn index bbb7c0b99d1de1..f114d1f0c1b2a8 100644 --- a/gpu/command_buffer/client/BUILD.gn +++ b/gpu/command_buffer/client/BUILD.gn @@ -182,10 +182,10 @@ component("gl_in_process_context") { deps = [ ":gles2_implementation", - "//gpu", - "//gpu/command_buffer/common:gles2_utils", "//base", "//base/third_party/dynamic_annotations", + "//gpu", + "//gpu/command_buffer/common:gles2_utils", "//ui/gfx/geometry", "//ui/gl", ] diff --git a/gpu/gles2_conform_support/egl/BUILD.gn b/gpu/gles2_conform_support/egl/BUILD.gn index 32fb8706ef4214..ee06fbf32642cf 100644 --- a/gpu/gles2_conform_support/egl/BUILD.gn +++ b/gpu/gles2_conform_support/egl/BUILD.gn @@ -24,9 +24,9 @@ source_set("egl") { deps = [ "//base", + "//gpu", "//gpu/command_buffer/client:gles2_implementation_no_check", "//gpu/command_buffer/service", - "//gpu", "//ui/base", "//ui/gfx", "//ui/gfx/geometry", diff --git a/ios/chrome/BUILD.gn b/ios/chrome/BUILD.gn index daa2e2ed49e1e2..0371de289b9b68 100644 --- a/ios/chrome/BUILD.gn +++ b/ios/chrome/BUILD.gn @@ -42,8 +42,8 @@ test("ios_chrome_unittests") { deps = [ "//base", - "//base/test:test_support", "//base:prefs_test_support", + "//base/test:test_support", "//components/bookmarks/test", "//components/enhanced_bookmarks:test_support", "//components/favicon_base", diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn index 829cd499ed87a3..d7a8a61effda29 100644 --- a/ios/chrome/browser/BUILD.gn +++ b/ios/chrome/browser/BUILD.gn @@ -433,6 +433,7 @@ source_set("browser") { ] deps = [ + ":injected_js", "//base", "//base:prefs", "//breakpad:client", @@ -514,7 +515,6 @@ source_set("browser") { "//ui/base", "//ui/gfx", "//url", - ":injected_js", # TODO(crbug.com/459705): add support for resource packing and change the # dependency to be on the packed resources instead of the unpacked ones. @@ -533,8 +533,8 @@ source_set("browser") { if (enable_rlz) { deps += [ - "//components/rlz", ":rlz", + "//components/rlz", ] } diff --git a/ios/net/BUILD.gn b/ios/net/BUILD.gn index 25403883f68f62..d894d7bef84b13 100644 --- a/ios/net/BUILD.gn +++ b/ios/net/BUILD.gn @@ -54,12 +54,12 @@ source_set("net") { test("ios_net_unittests") { deps = [ + ":net", "//base", "//base/test:run_all_unittests", "//net:test_support", "//testing/gtest", "//url", - ":net", ] sources = [ diff --git a/ios/testing/BUILD.gn b/ios/testing/BUILD.gn index 782c2aeefdbfcf..9a1a6bb567ba5d 100644 --- a/ios/testing/BUILD.gn +++ b/ios/testing/BUILD.gn @@ -24,11 +24,11 @@ source_set("ocmock_support") { test("ocmock_support_unittest") { deps = [ + ":ocmock_support", "//base/test:run_all_unittests", "//base/test:test_support", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", - ":ocmock_support", ] } diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn index c2ca4a0e009561..854161edd31d67 100644 --- a/ios/web/BUILD.gn +++ b/ios/web/BUILD.gn @@ -20,6 +20,9 @@ config("config") { source_set("web") { deps = [ + ":core", + ":js_resources", + ":user_agent", "//base", "//components/url_formatter", "//ios/net", @@ -30,9 +33,6 @@ source_set("web") { "//ui/gfx/geometry:geometry", "//ui/resources", "//url", - ":core", - ":js_resources", - ":user_agent", ] sources = [ @@ -325,12 +325,12 @@ source_set("test_support") { testonly = true deps = [ + ":web", "//ios/testing:ocmock_support", "//ios/third_party/gcdwebserver", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", - ":web", ] sources = [ @@ -374,6 +374,8 @@ source_set("test_support") { test("ios_web_unittests") { deps = [ + ":test_support", + ":web", "//base", "//base/test:test_support", "//ios/testing:ocmock_support", @@ -382,8 +384,6 @@ test("ios_web_unittests") { "//testing/gtest", "//third_party/ocmock", "//ui/base:test_support", - ":test_support", - ":web", ] sources = [ diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn index ead44ce547df2a..29e3a9574205ec 100644 --- a/ipc/mojo/BUILD.gn +++ b/ipc/mojo/BUILD.gn @@ -35,6 +35,7 @@ component("mojo") { defines = [ "IPC_MOJO_IMPLEMENTATION" ] deps = [ + ":client_channel", "//base", "//base/third_party/dynamic_annotations", "//ipc", @@ -42,7 +43,6 @@ component("mojo") { "//mojo/public/c/environment:environment", "//mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/edk/system", - ":client_channel", ] } diff --git a/jingle/BUILD.gn b/jingle/BUILD.gn index c6c19e5d83396c..10f2b2b5fd7f8a 100644 --- a/jingle/BUILD.gn +++ b/jingle/BUILD.gn @@ -92,11 +92,11 @@ if (enable_webrtc || !is_android) { "//third_party/libjingle", ] deps = [ + ":jingle_glue", "//base", "//net", "//third_party/expat", "//url", - ":jingle_glue", ] } diff --git a/mandoline/BUILD.gn b/mandoline/BUILD.gn index 9022e7d2dbef37..ff9ff7366df8d4 100644 --- a/mandoline/BUILD.gn +++ b/mandoline/BUILD.gn @@ -9,8 +9,8 @@ group("all") { testonly = true deps = [ - "//mojo", ":tests", + "//mojo", ] if (is_android) { diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn index d986ec388b38bc..59bbcb4935333f 100644 --- a/mandoline/app/android/BUILD.gn +++ b/mandoline/app/android/BUILD.gn @@ -101,8 +101,8 @@ android_library("java") { java_files = [ "apk/src/org/chromium/mandoline/MandolineActivity.java" ] deps = [ - "//mojo/runner:java", "//base:base_java", + "//mojo/runner:java", ] } @@ -132,9 +132,9 @@ android_apk("mandoline_apk") { ":copy_mandoline_runner", ":java", ":mandoline_apk_resources", + "//base:base_java", "//mojo/runner:java", "//mojo/runner:resources", - "//base:base_java", "//ui/platform_window/android:platform_window_java", google_play_services_resources, ] diff --git a/mandoline/ui/desktop_ui/BUILD.gn b/mandoline/ui/desktop_ui/BUILD.gn index e84c56513b9df5..f5aa86bf053e04 100644 --- a/mandoline/ui/desktop_ui/BUILD.gn +++ b/mandoline/ui/desktop_ui/BUILD.gn @@ -35,7 +35,6 @@ source_set("lib") { ] deps = [ - "public/interfaces", "//base", "//components/web_view/public/cpp", "//components/web_view/public/interfaces", @@ -52,6 +51,7 @@ source_set("lib") { "//ui/views", "//ui/views/mus:for_mojo_application", "//url", + "public/interfaces", ] } diff --git a/mandoline/ui/phone_ui/BUILD.gn b/mandoline/ui/phone_ui/BUILD.gn index 0f3ddf734f3d6a..21de6851ad5ddb 100644 --- a/mandoline/ui/phone_ui/BUILD.gn +++ b/mandoline/ui/phone_ui/BUILD.gn @@ -12,8 +12,8 @@ mojo_native_application("phone_ui") { deps = [ ":lib", - "//mojo/application/public/cpp", "//components/web_view:web_view", + "//mojo/application/public/cpp", ] } diff --git a/mash/wm/BUILD.gn b/mash/wm/BUILD.gn index fc8d2e865a10c3..3aad50e75cfb69 100644 --- a/mash/wm/BUILD.gn +++ b/mash/wm/BUILD.gn @@ -10,8 +10,8 @@ import("//tools/grit/repack.gni") group("wm") { testonly = true deps = [ - ":example_wm", ":apptests", + ":example_wm", ] } @@ -159,8 +159,8 @@ source_set("unittests") { "//testing/gtest", "//third_party/mojo/src/mojo/edk/system", "//ui/events", - "//ui/gfx/geometry", "//ui/gfx:test_support", + "//ui/gfx/geometry", "//ui/mojo/geometry:interfaces", "//ui/mojo/geometry:util", ] diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn index b01c488ae93bfc..ee7c518a1e8445 100644 --- a/media/base/BUILD.gn +++ b/media/base/BUILD.gn @@ -209,8 +209,8 @@ source_set("base") { defines = [] public_deps = [] deps = [ - "//ui/events:events_base", "//skia", + "//ui/events:events_base", ] libs = [] configs += [ @@ -358,8 +358,8 @@ source_set("test_support") { ] configs += [ "//media:media_config" ] deps = [ - "//testing/gmock", "//media:shared_memory_support", + "//testing/gmock", ] } diff --git a/media/blink/BUILD.gn b/media/blink/BUILD.gn index 3b9365cca75ee8..3e974486d9a26f 100644 --- a/media/blink/BUILD.gn +++ b/media/blink/BUILD.gn @@ -106,8 +106,8 @@ test("media_blink_unittests") { "//testing/gmock", "//testing/gtest", "//third_party/WebKit/public:blink", - "//ui/gfx/geometry", "//ui/gfx:test_support", + "//ui/gfx/geometry", "//url", ] diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn index d0ae8f157d793a..4213a2362b5ef4 100644 --- a/media/cast/BUILD.gn +++ b/media/cast/BUILD.gn @@ -6,8 +6,8 @@ import("//testing/test.gni") component("cast") { deps = [ - ":sender", ":receiver", + ":sender", ] } diff --git a/media/midi/BUILD.gn b/media/midi/BUILD.gn index 29a5080ef7fe7b..01a2e09f3e76f3 100644 --- a/media/midi/BUILD.gn +++ b/media/midi/BUILD.gn @@ -117,8 +117,8 @@ component("midi") { defines += [ "EXPORT_USB_MIDI" ] deps += [ - "//base:i18n", ":midi_jni_headers", + "//base:i18n", ] } diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn index 32228fc880ed05..8a6261f90850ff 100644 --- a/media/mojo/services/BUILD.gn +++ b/media/mojo/services/BUILD.gn @@ -141,8 +141,8 @@ source_set("renderer_service") { ":media_client", "//base", "//media", - "//media/mojo/interfaces", "//media:shared_memory_support", + "//media/mojo/interfaces", "//mojo/common", ] } diff --git a/media/test/BUILD.gn b/media/test/BUILD.gn index 3ce4648e80b095..721c715dd3f2a5 100644 --- a/media/test/BUILD.gn +++ b/media/test/BUILD.gn @@ -102,8 +102,8 @@ source_set("mojo_pipeline_integration_tests") { "//media/mojo/services:renderer_service", "//mojo/application/public/cpp:test_support", "//testing/gtest", - "//ui/gfx/geometry", "//ui/gfx:test_support", + "//ui/gfx/geometry", # TODO(dalecurtis): Required since the gmock header is included in the # header for pipeline_integration_test_base.h. This should be moved diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn index d1dce6be341919..2619bdfb7a8186 100644 --- a/mojo/android/BUILD.gn +++ b/mojo/android/BUILD.gn @@ -7,9 +7,9 @@ import("//build/config/android/rules.gni") group("android") { testonly = true deps = [ - ":system_java", ":mojo_javatests", ":mojo_test_apk", + ":system_java", ] } @@ -128,8 +128,8 @@ shared_library("mojo_java_unittests") { "//build/config/sanitizers:deps", "//mojo/message_pump", "//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils", - "//mojo/public/cpp/test_support:test_utils", "//mojo/public/cpp/environment", + "//mojo/public/cpp/test_support:test_utils", "//third_party/mojo/src/mojo/edk/system", ] defines = [ "UNIT_TEST" ] @@ -138,12 +138,12 @@ shared_library("mojo_java_unittests") { android_apk("mojo_test_apk") { testonly = true deps = [ - ":mojo_javatests", ":mojo_java_unittests", + ":mojo_javatests", ":system_java", "//base:base_java", - "//mojo/public/java:bindings", "//mojo/public/interfaces/bindings/tests:test_interfaces", + "//mojo/public/java:bindings", ] native_libs = [ "libmojo_java_unittests.so" ] apk_name = "MojoTest" diff --git a/mojo/application/public/cpp/BUILD.gn b/mojo/application/public/cpp/BUILD.gn index fb34910ba68d09..022a3d53a9d2f2 100644 --- a/mojo/application/public/cpp/BUILD.gn +++ b/mojo/application/public/cpp/BUILD.gn @@ -5,8 +5,8 @@ # GYP version: mojo/mojo_base.gyp:mojo_application_base source_set("cpp") { public_deps = [ - ":sources", ":init_commandline", + ":sources", ] } diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn index 08752a01d2aba7..c95fdba507558a 100644 --- a/mojo/converters/surfaces/BUILD.gn +++ b/mojo/converters/surfaces/BUILD.gn @@ -30,9 +30,9 @@ component("surfaces") { "//cc/surfaces:surface_id", "//components/mus/public/interfaces", "//gpu", - "//ui/gfx/geometry", "//mojo/environment:chromium", "//mojo/public/c/system:for_component", "//skia", + "//ui/gfx/geometry", ] } diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn index 89e9d2650b99b0..95cad2ba46f4a6 100644 --- a/mojo/converters/surfaces/tests/BUILD.gn +++ b/mojo/converters/surfaces/tests/BUILD.gn @@ -21,8 +21,8 @@ test("mojo_surfaces_lib_unittests") { "//testing/gtest", "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//ui/gfx", - "//ui/gfx/geometry", "//ui/gfx:test_support", + "//ui/gfx/geometry", "//ui/mojo/geometry:interfaces", ] diff --git a/mojo/converters/transform/BUILD.gn b/mojo/converters/transform/BUILD.gn index f97791d0c514a5..d3e29a1d5631c6 100644 --- a/mojo/converters/transform/BUILD.gn +++ b/mojo/converters/transform/BUILD.gn @@ -9,9 +9,9 @@ component("transform") { "//ui/gfx", ] deps = [ - "//skia", "//mojo/environment:chromium", "//mojo/public/c/system:for_component", + "//skia", "//ui/mojo/geometry:interfaces", ] diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/edk/embedder/BUILD.gn index 4b298244cbe222..e307ed102bcb0f 100644 --- a/mojo/edk/embedder/BUILD.gn +++ b/mojo/edk/embedder/BUILD.gn @@ -135,10 +135,10 @@ source_set("embedder_unittests2") { # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are # declared in third party only for now. - "//third_party/mojo/src/mojo/edk/system", "//mojo/edk/system:test_utils", "//mojo/edk/test:test_support", "//testing/gtest", + "//third_party/mojo/src/mojo/edk/system", # TODO(use_chrome_edk): temporary since the Mojo wrapper primitives are # declared in third party only for now. diff --git a/mojo/edk/js/BUILD.gn b/mojo/edk/js/BUILD.gn index 9acb481b1da9f8..50f62d98fffb7f 100644 --- a/mojo/edk/js/BUILD.gn +++ b/mojo/edk/js/BUILD.gn @@ -12,8 +12,8 @@ group("tests") { testonly = true deps = [ # TODO(use_chrome_edk): remove "2" - "test:js_unittests2", "test:js_integration_tests2", + "test:js_unittests2", ] } diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn index 1f04f6582a7d4c..f0c1e820b6f771 100644 --- a/mojo/edk/system/BUILD.gn +++ b/mojo/edk/system/BUILD.gn @@ -79,11 +79,11 @@ static_library("system") { all_dependent_configs = [ ":system_config" ] public_deps = [ + "../../../mojo/public/c/system", + "../../../mojo/public/cpp/system", "../embedder", "../embedder:delegates", "../embedder:platform", - "../../../mojo/public/c/system", - "../../../mojo/public/cpp/system", ] deps = [ @@ -103,8 +103,8 @@ group("tests") { testonly = true deps = [ # TODO(use_chrome_edk): remove "2" - ":mojo_system_unittests2", ":mojo_message_pipe_perftests2", + ":mojo_system_unittests2", ] } @@ -161,8 +161,8 @@ test("mojo_system_unittests2") { ":test_utils", # TODO(use_chrome_edk): remove "2" - "../embedder:embedder_unittests2", "../../../mojo/public/cpp/environment:standalone", + "../embedder:embedder_unittests2", "../test:test_support", "//base", "//base/test:test_support", @@ -187,9 +187,9 @@ test("mojo_message_pipe_perftests2") { deps = [ ":test_utils", - "../test:test_support", - "../test:run_all_perftests", "../../../mojo/public/cpp/environment:standalone", + "../test:run_all_perftests", + "../test:test_support", "//base", "//base/test:test_support", "//testing/gtest", diff --git a/mojo/package_manager/BUILD.gn b/mojo/package_manager/BUILD.gn index 3d69ae9bfd2f3e..21b878ae4295fe 100644 --- a/mojo/package_manager/BUILD.gn +++ b/mojo/package_manager/BUILD.gn @@ -33,8 +33,8 @@ test("unittests") { "//mojo/application/public/cpp", "//mojo/shell", "//mojo/shell:test_support", - "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//testing/gtest", + "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//url", ] } diff --git a/mojo/public/BUILD.gn b/mojo/public/BUILD.gn index d7bb448beee889..b917cf1cc22732 100644 --- a/mojo/public/BUILD.gn +++ b/mojo/public/BUILD.gn @@ -16,8 +16,8 @@ group("public") { if (is_android) { deps += [ - "java:system", "java:bindings", + "java:system", ] } } diff --git a/mojo/public/c/gpu/BUILD.gn b/mojo/public/c/gpu/BUILD.gn index 07e00d138f5a9e..7f076902188fe4 100644 --- a/mojo/public/c/gpu/BUILD.gn +++ b/mojo/public/c/gpu/BUILD.gn @@ -12,8 +12,8 @@ group("gpu") { deps = [ ":MGL", - "../../platform/native:mgl_thunks", "../../platform/native:gles2", + "../../platform/native:mgl_thunks", ] } diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni index 72398b758bd415..972584d49d099b 100644 --- a/mojo/public/mojo_application.gni +++ b/mojo/public/mojo_application.gni @@ -84,8 +84,8 @@ template("mojo_native_application") { deps = [ "//mojo/platform_handle:for_shared_library", - "//mojo/public/gles2:for_shared_library", "//mojo/public/c/system:for_shared_library", + "//mojo/public/gles2:for_shared_library", ] deps += mojo_deps diff --git a/mojo/public/platform/native/BUILD.gn b/mojo/public/platform/native/BUILD.gn index f7d31f58f2cf64..4efc946f3d04df 100644 --- a/mojo/public/platform/native/BUILD.gn +++ b/mojo/public/platform/native/BUILD.gn @@ -39,8 +39,8 @@ source_set("gles2") { configs += [ "//third_party/khronos:khronos_headers" ] deps = [ - "//mojo/public/c/gles2", "//mojo/public/c/environment", + "//mojo/public/c/gles2", "//mojo/public/c/system", ] diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn index 49efb46dc661d8..0fe40cbf6c84ba 100644 --- a/mojo/runner/BUILD.gn +++ b/mojo/runner/BUILD.gn @@ -102,10 +102,10 @@ source_set("init") { ] deps = [ - "//mojo/runner/host:switches", "//base", "//base:base_static", "//base:i18n", + "//mojo/runner/host:switches", ] } @@ -124,8 +124,8 @@ source_set("lib") { deps = [ ":init", "//base", - "//base/third_party/dynamic_annotations", "//base:base_static", + "//base/third_party/dynamic_annotations", "//components/devtools_service/public/cpp", "//components/devtools_service/public/interfaces", "//components/tracing:startup_tracing", diff --git a/mojo/runner/child/BUILD.gn b/mojo/runner/child/BUILD.gn index e10de5ee4b5434..7ba5fb78315cef 100644 --- a/mojo/runner/child/BUILD.gn +++ b/mojo/runner/child/BUILD.gn @@ -8,8 +8,8 @@ import("//mojo/public/tools/bindings/mojom.gni") group("child") { testonly = true deps = [ - ":lib", ":apptests", + ":lib", ] } diff --git a/mojo/runner/host/BUILD.gn b/mojo/runner/host/BUILD.gn index f1890f87b26a85..713251e2e6b860 100644 --- a/mojo/runner/host/BUILD.gn +++ b/mojo/runner/host/BUILD.gn @@ -66,8 +66,8 @@ source_set("lib") { "//mojo/gles2", "//mojo/message_pump", "//mojo/platform_handle:platform_handle_impl", - "//mojo/runner/child:interfaces", "//mojo/runner:init", + "//mojo/runner/child:interfaces", "//mojo/shell", "//third_party/mojo/src/mojo/edk/system", ] diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn index 76d6bdc0175b35..286760dcaf023a 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -104,8 +104,8 @@ source_set("lib") { "//net", "//net:extras", "//net:http_server", - "//url", "//sql/mojo", + "//url", ] } diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index 8478000f337589..c1c6aae3c0dff1 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn @@ -54,10 +54,10 @@ source_set("shell") { "//base/third_party/dynamic_annotations", "//crypto:crypto", "//mojo/application/public/cpp:sources", - "//url", - "//third_party/mojo/src/mojo/edk/system", "//mojo/environment:chromium", "//mojo/util:filename_util", + "//third_party/mojo/src/mojo/edk/system", + "//url", ] } @@ -101,8 +101,8 @@ test("mojo_shell_unittests") { "//mojo/package_manager", "//mojo/public/cpp/system", "//mojo/util:filename_util", - "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//testing/gtest", + "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//url", ] } diff --git a/net/BUILD.gn b/net/BUILD.gn index 62648e4a8244f6..0bba8a46181159 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1101,8 +1101,8 @@ if (is_linux) { ":net", ":test_support", "//build/config/sanitizers:deps", - "//testing/gtest", "//testing/gmock", + "//testing/gtest", "//third_party/boringssl", ] } @@ -1158,8 +1158,8 @@ if (is_linux) { ] deps = [ ":balsa", - ":epoll_server", ":epoll_quic_tools", + ":epoll_server", ":net", ":simple_quic_tools", "//base", @@ -1174,8 +1174,8 @@ if (is_linux) { ] deps = [ ":balsa", - ":epoll_server", ":epoll_quic_tools", + ":epoll_server", ":net", ":simple_quic_tools", "//base", diff --git a/net/android/BUILD.gn b/net/android/BUILD.gn index 7cd9b08ec63570..df00495ad2559c 100644 --- a/net/android/BUILD.gn +++ b/net/android/BUILD.gn @@ -29,9 +29,9 @@ android_aidl("remote_android_keystore_aidl") { android_library("net_java_test_support") { DEPRECATED_java_in_dir = "../test/android/javatests/src" deps = [ + ":net_java", "//base:base_java", "//third_party/android_tools:legacy_http_javalib", - ":net_java", ] srcjar_deps = [ ":net_java_test_support_enums_srcjar" ] } @@ -44,10 +44,10 @@ android_resources("net_unittests_apk_resources") { android_library("net_javatests") { DEPRECATED_java_in_dir = "javatests/src" deps = [ - "//base:base_java", - "//base:base_java_test_support", ":net_java", ":net_java_test_support", + "//base:base_java", + "//base:base_java_test_support", ] } diff --git a/ppapi/host/BUILD.gn b/ppapi/host/BUILD.gn index 51bd0c511c7583..9df23ac237b07f 100644 --- a/ppapi/host/BUILD.gn +++ b/ppapi/host/BUILD.gn @@ -33,10 +33,10 @@ component("host") { "//base", "//ipc", "//media:shared_memory_support", - "//ppapi/shared_impl", "//ppapi/c", - "//ppapi/proxy:ipc", "//ppapi/proxy", + "//ppapi/proxy:ipc", + "//ppapi/shared_impl", "//ui/events:events_base", "//ui/surface", "//url", diff --git a/ppapi/native_client/BUILD.gn b/ppapi/native_client/BUILD.gn index 45ee5acb2562ad..14138b3ff93d61 100644 --- a/ppapi/native_client/BUILD.gn +++ b/ppapi/native_client/BUILD.gn @@ -21,17 +21,17 @@ if (is_nacl) { "//base", "//components/tracing", "//gpu/command_buffer/client", - "//gpu/command_buffer/common", "//gpu/command_buffer/client:gles2_implementation", + "//gpu/command_buffer/common", "//gpu/ipc", "//ipc", "//media:shared_memory_support", - "//native_client/src/untrusted/irt:irt_core_lib", - "//native_client/src/shared/srpc", + "//native_client/src/shared/gio", "//native_client/src/shared/platform", + "//native_client/src/shared/srpc", "//native_client/src/tools/tls_edit($host_toolchain)", + "//native_client/src/untrusted/irt:irt_core_lib", "//native_client/src/untrusted/nacl:imc_syscalls", - "//native_client/src/shared/gio", "//ppapi/native_client/src/untrusted/pnacl_irt_shim:irt", "//ppapi/proxy", "//ppapi/proxy:ipc", @@ -101,15 +101,15 @@ if (is_nacl) { group("irt") { public_deps = [ - ":nacl_irt_debuglink(//build/toolchain/nacl:irt_${target_cpu})", ":nacl_irt_debug(//build/toolchain/nacl:irt_${target_cpu})", + ":nacl_irt_debuglink(//build/toolchain/nacl:irt_${target_cpu})", ] # On 32-bit Windows, we also ship the 64-bit IRT. if (is_win && target_cpu == "x86") { public_deps += [ - ":nacl_irt_debuglink(//build/toolchain/nacl:irt_x64)", ":nacl_irt_debug(//build/toolchain/nacl:irt_x64)", + ":nacl_irt_debuglink(//build/toolchain/nacl:irt_x64)", ] } } diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index 613b68fb93dd9a..15a65a93334a1f 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -53,7 +53,6 @@ group("remoting_all") { deps += [ "//remoting:remoting_perftests", "//remoting/host", - "//remoting/host:remoting_native_messaging_manifests", ] @@ -182,8 +181,8 @@ if (!is_mac) { "//net:test_support", "//remoting/base", "//testing/gtest", - "//third_party/webrtc/modules/desktop_capture", "//third_party/libjingle", + "//third_party/webrtc/modules/desktop_capture", ] if (enable_webrtc) { diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 54898909566e81..23e5fb88402d2c 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn @@ -80,8 +80,8 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. "//remoting/protocol", "//remoting/resources", "//ui/base", - "//ui/events/platform", "//ui/events:dom_keycode_converter", + "//ui/events/platform", ] if (enable_configuration_policy) { @@ -313,9 +313,9 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. deps = [ ":host", ":test_support", - "//remoting/host/setup", "//remoting/host/it2me:common", "//remoting/host/native_messaging", + "//remoting/host/setup", "//remoting/proto", "//skia", "//testing/gmock", @@ -518,8 +518,8 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. ] deps = [ - ":remoting_me2me_host_static", ":credits", + ":remoting_me2me_host_static", "//build/config/sanitizers:deps", ] } @@ -536,8 +536,8 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. "//base", "//remoting/base:breakpad", "//remoting/host", - "//remoting/host/setup", "//remoting/host/native_messaging", + "//remoting/host/setup", ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/remoting/test/BUILD.gn b/remoting/test/BUILD.gn index d2b64b398fe04f..fd014ff10e8cdd 100644 --- a/remoting/test/BUILD.gn +++ b/remoting/test/BUILD.gn @@ -151,8 +151,8 @@ source_set("unit_tests") { ] deps = [ - ":test_support", ":ar_test_driver_common", + ":test_support", "//base", "//net:test_support", "//testing/gmock", diff --git a/remoting/tools/javascript_key_tester/pnacl/BUILD.gn b/remoting/tools/javascript_key_tester/pnacl/BUILD.gn index e500e025fb4139..fbd8935123fd4b 100644 --- a/remoting/tools/javascript_key_tester/pnacl/BUILD.gn +++ b/remoting/tools/javascript_key_tester/pnacl/BUILD.gn @@ -12,7 +12,7 @@ executable("remoting_key_tester_newlib") { deps = [ "//build/config/sanitizers:deps", - "//ppapi/native_client:ppapi_lib", "//ppapi/cpp", + "//ppapi/native_client:ppapi_lib", ] } diff --git a/remoting/webapp/build_template.gni b/remoting/webapp/build_template.gni index 370a1436ac3004..ab5d1167f1693a 100644 --- a/remoting/webapp/build_template.gni +++ b/remoting/webapp/build_template.gni @@ -217,12 +217,12 @@ template("desktop_remoting_webapp") { ] deps = [ - ":$locales_listfile", ":$background_html", + ":$locales_listfile", + ":$main_html", ":$message_window_html", - ":$wcs_sandbox_html", ":$public_session_html", - ":$main_html", + ":$wcs_sandbox_html", "//remoting/resources", "//remoting/webapp:credits", ] @@ -511,13 +511,13 @@ template("app_remoting_shared_module") { ] deps = [ - ":$locales_listfile", ":$background_html", ":$feedback_consent_html", ":$loading_window_html", + ":$locales_listfile", + ":$main_html", ":$message_window_html", ":$wcs_sandbox_html", - ":$main_html", "//remoting/resources", "//remoting/webapp:credits", ] diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn index f50efe56f9be5e..2a6436ff2be8dc 100644 --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn @@ -276,9 +276,9 @@ component("seccomp_bpf_helpers") { defines = [ "SANDBOX_IMPLEMENTATION" ] deps = [ - "//base", ":sandbox_services", ":seccomp_bpf", + "//base", ] if (is_nacl_nonsfi) { diff --git a/sandbox/win/BUILD.gn b/sandbox/win/BUILD.gn index c8bb770d8c1575..129f065ac52ee9 100644 --- a/sandbox/win/BUILD.gn +++ b/sandbox/win/BUILD.gn @@ -280,8 +280,8 @@ test("sandbox_poc") { libs = [ "comctl32.lib" ] deps = [ - ":sandbox", ":pocdll", + ":sandbox", ] } diff --git a/skia/BUILD.gn b/skia/BUILD.gn index e7d41ca8b62628..40b38ad0ecbbc2 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -471,9 +471,9 @@ component("skia") { sources += [ "ext/platform_device_linux.cc" ] set_sources_assignment_filter(sources_assignment_filter) deps += [ + "//third_party/android_tools:cpu_features", "//third_party/expat", "//third_party/freetype-android:freetype", - "//third_party/android_tools:cpu_features", ] } @@ -596,11 +596,11 @@ source_set("skia_opts") { if (current_cpu == "x86" || current_cpu == "x64") { sources = gypi_skia_opts.sse2_sources deps += [ + ":skia_opts_avx", + ":skia_opts_avx2", ":skia_opts_sse3", ":skia_opts_sse41", ":skia_opts_sse42", - ":skia_opts_avx", - ":skia_opts_avx2", ] } else if (current_cpu == "arm") { # The assembly uses the frame pointer register (r7 in Thumb/r11 in diff --git a/sql/BUILD.gn b/sql/BUILD.gn index 8d071a3e7747fb..d805c6544cec38 100644 --- a/sql/BUILD.gn +++ b/sql/BUILD.gn @@ -30,8 +30,8 @@ component("sql") { deps = [ "//base", - "//third_party/sqlite", "//base/third_party/dynamic_annotations", + "//third_party/sqlite", ] } @@ -100,8 +100,8 @@ test("sql_unittests") { configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ - ":sql", ":redirection_header", + ":sql", ":test_support", "//base/allocator", "//base/test:test_support", diff --git a/storage/common/BUILD.gn b/storage/common/BUILD.gn index 605fd417af15f1..35669e106f3799 100644 --- a/storage/common/BUILD.gn +++ b/storage/common/BUILD.gn @@ -40,7 +40,7 @@ component("common") { "//base", "//base/third_party/dynamic_annotations", "//net", - "//url", "//third_party/WebKit/public:blink_headers", + "//url", ] } diff --git a/sync/BUILD.gn b/sync/BUILD.gn index 48de0de9af5777..664fa46200aad9 100644 --- a/sync/BUILD.gn +++ b/sync/BUILD.gn @@ -437,10 +437,10 @@ source_set("sync_core") { "//google_apis", "//net", "//sql", + "//sync/protocol", "//third_party/leveldatabase", "//third_party/zlib", "//url", - "//sync/protocol", ] if (is_android) { @@ -532,9 +532,9 @@ static_library("test_support_sync_core") { public_deps = [ "//base", + "//sync", "//testing/gmock", "//testing/gtest", - "//sync", ] defines = [ "SYNC_TEST" ] @@ -562,10 +562,10 @@ static_library("test_support_sync_internal_api") { ] public_deps = [ + ":test_support_sync_core", "//base", - "//testing/gtest", "//sync", - ":test_support_sync_core", + "//testing/gtest", ] defines = [ "SYNC_TEST" ] @@ -775,8 +775,8 @@ static_library("test_support_sync_fake_server") { deps = [ "//base", "//net", - "//testing/gtest", "//sync", + "//testing/gtest", "//url", ] @@ -843,10 +843,10 @@ if (is_android) { android_library("sync_java_test_support") { testonly = true deps = [ - "android:sync_java", "//base:base_java", "//base:base_java_test_support", "//third_party/jsr-305:jsr_305_javalib", + "android:sync_java", ] DEPRECATED_java_in_dir = "test/android/javatests/src" } diff --git a/sync/android/BUILD.gn b/sync/android/BUILD.gn index 48f676001c01ed..e7bd9e94b51da4 100644 --- a/sync/android/BUILD.gn +++ b/sync/android/BUILD.gn @@ -9,10 +9,10 @@ android_library("sync_java") { deps = [ "//base:base_java", "//net/android:net_java", + "//third_party/android_tools:android_gcm_java", "//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/cacheinvalidation:cacheinvalidation_proto_java", "//third_party/jsr-305:jsr_305_javalib", - "//third_party/android_tools:android_gcm_java", ] srcjar_deps = [ ":java_enums" ] DEPRECATED_java_in_dir = "java/src" diff --git a/testing/android/junit/BUILD.gn b/testing/android/junit/BUILD.gn index d4796292785fe4..018760abf778e8 100644 --- a/testing/android/junit/BUILD.gn +++ b/testing/android/junit/BUILD.gn @@ -13,8 +13,8 @@ java_library("junit_test_support") { deps = [ "//third_party/junit", "//third_party/mockito:mockito_java", - "//third_party/robolectric:robolectric_java", "//third_party/robolectric:android-all-4.3_r2-robolectric-0", + "//third_party/robolectric:robolectric_java", ] } diff --git a/third_party/WebKit/Source/bindings/core/BUILD.gn b/third_party/WebKit/Source/bindings/core/BUILD.gn index 2b0dd105cca748..14a8a73a685ce9 100644 --- a/third_party/WebKit/Source/bindings/core/BUILD.gn +++ b/third_party/WebKit/Source/bindings/core/BUILD.gn @@ -17,8 +17,8 @@ compute_interfaces_info_individual("interfaces_info_individual_core") { component_info_file = "$bindings_core_output_dir/ComponentInfoCore.pickle" deps = [ "//third_party/WebKit/Source/bindings/core:core_global_constructors_idls", - "//third_party/WebKit/Source/core:generated_testing_idls_settings", "//third_party/WebKit/Source/core:generated_testing_idls_internal_runtime_flags", + "//third_party/WebKit/Source/core:generated_testing_idls_settings", ] } diff --git a/third_party/WebKit/Source/bindings/modules/BUILD.gn b/third_party/WebKit/Source/bindings/modules/BUILD.gn index 5ecac1ccef205b..e84cd69af4e1d1 100644 --- a/third_party/WebKit/Source/bindings/modules/BUILD.gn +++ b/third_party/WebKit/Source/bindings/modules/BUILD.gn @@ -13,10 +13,10 @@ visibility = [ "//third_party/WebKit/*" ] # GYP version: Source/bindings/modules/generated.gyp:bindings_modules_generated group("bindings_modules_generated") { public_deps = [ - ":modules_bindings_generated_event_interfaces", ":bindings_modules_generated_event_modules_factory", ":bindings_modules_generated_event_modules_names", ":bindings_modules_generated_event_target_modules_names", + ":modules_bindings_generated_event_interfaces", ] } diff --git a/third_party/WebKit/Source/bindings/scripts/scripts.gni b/third_party/WebKit/Source/bindings/scripts/scripts.gni index 7022af29b8bf8a..5655ed7c4a3078 100644 --- a/third_party/WebKit/Source/bindings/scripts/scripts.gni +++ b/third_party/WebKit/Source/bindings/scripts/scripts.gni @@ -182,9 +182,8 @@ template("idl_compiler") { "//third_party/WebKit/Source/bindings/modules:interfaces_info", "//third_party/WebKit/Source/bindings/modules:modules_core_global_constructors_idls", "//third_party/WebKit/Source/bindings/modules:modules_global_constructors_idls", - - "//third_party/WebKit/Source/bindings/scripts:cached_lex_yacc_tables", "//third_party/WebKit/Source/bindings/scripts:cached_jinja_templates", + "//third_party/WebKit/Source/bindings/scripts:cached_lex_yacc_tables", "//third_party/WebKit/Source/core:generated_testing_idls", ] } @@ -237,8 +236,8 @@ template("idl_impl") { "//third_party/WebKit/Source/bindings/core:interfaces_info_individual_core", "//third_party/WebKit/Source/bindings/modules:interfaces_info", "//third_party/WebKit/Source/bindings/modules:interfaces_info_individual_modules", - "//third_party/WebKit/Source/bindings/scripts:cached_lex_yacc_tables", "//third_party/WebKit/Source/bindings/scripts:cached_jinja_templates", + "//third_party/WebKit/Source/bindings/scripts:cached_lex_yacc_tables", ] } } diff --git a/third_party/WebKit/Source/core/BUILD.gn b/third_party/WebKit/Source/core/BUILD.gn index 4a6d874eb48c60..b80e959b711d08 100644 --- a/third_party/WebKit/Source/core/BUILD.gn +++ b/third_party/WebKit/Source/core/BUILD.gn @@ -49,10 +49,9 @@ source_set("generated") { deps = [ ":make_core_generated", ":prerequisites", - "inspector:protocol_sources", - "inspector:instrumentation_sources", "//gin", "//skia", + "//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", "//third_party/iccjpeg", "//third_party/libpng", "//third_party/libwebp", @@ -61,7 +60,8 @@ source_set("generated") { "//third_party/npapi", "//third_party/qcms", "//third_party/sqlite", - "//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", + "inspector:instrumentation_sources", + "inspector:protocol_sources", # FIXME: don't depend on bindings/modules http://crbug.com/358074 "//third_party/WebKit/Source/bindings/modules:bindings_modules_generated", @@ -76,9 +76,9 @@ source_set("generated") { # GYP version: WebKit/Source/core/core.gyp:webcore_prerequisites source_set("prerequisites") { public_deps = [ - "//third_party/WebKit/Source/wtf", "//gpu/command_buffer/client:gles2_c_lib", "//skia", + "//third_party/WebKit/Source/wtf", "//third_party/angle:translator", "//third_party/iccjpeg", "//third_party/icu", @@ -97,9 +97,9 @@ source_set("prerequisites") { ] deps = [ ":make_core_generated", - "inspector:protocol_sources", - "inspector:instrumentation_sources", "//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", + "inspector:instrumentation_sources", + "inspector:protocol_sources", # FIXME: don't depend on bindings_modules http://crbug.com/358074 "//third_party/WebKit/Source/bindings/modules/v8:bindings_modules_generated", @@ -137,10 +137,10 @@ source_set("core") { public_deps = [ ":core_generated", "//skia", - "//third_party/npapi", - "//third_party/qcms", "//third_party/WebKit/Source/platform", "//third_party/WebKit/Source/wtf", + "//third_party/npapi", + "//third_party/qcms", "//url", "//v8", ] @@ -423,10 +423,9 @@ source_set("core_generated") { public_deps = [ ":make_core_generated", ":prerequisites", - "inspector:protocol_sources", - "inspector:instrumentation_sources", "//gin", "//skia", + "//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", "//third_party/iccjpeg", "//third_party/libpng", "//third_party/libwebp", @@ -435,7 +434,8 @@ source_set("core_generated") { "//third_party/npapi", "//third_party/qcms", "//third_party/sqlite", - "//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", + "inspector:instrumentation_sources", + "inspector:protocol_sources", # FIXME: don't depend on bindings/modules http://crbug.com/358074 "//third_party/WebKit/Source/bindings/modules:bindings_modules_generated", @@ -496,8 +496,8 @@ generate_event_interfaces("core_event_interfaces") { group("generated_testing_idls") { public_deps = [ ":generated_settings_macros", - ":generated_testing_idls_settings", ":generated_testing_idls_internal_runtime_flags", + ":generated_testing_idls_settings", ] } @@ -572,36 +572,36 @@ action("generated_testing_idls_internal_runtime_flags") { # GYP version: WebKit/Source/core/core_generated.gyp:make_core_generated group("make_core_generated") { public_deps = [ - ":make_core_generated_private_script", - ":make_core_generated_private_script_for_testing", - ":make_core_generated_html_entity_table", + ":make_core_generated_bison", + ":make_core_generated_css_property_metadata", ":make_core_generated_css_property_names", ":make_core_generated_css_tokenizer_codepoints", - ":make_core_generated_media_feature_names", - ":make_core_generated_media_features", - ":make_core_generated_media_type_names", - ":make_core_generated_style_property_shorthand", - ":make_core_generated_style_builder", - ":make_core_generated_css_property_metadata", ":make_core_generated_css_value_keywords", - ":make_core_generated_html_element_factory", - ":make_core_generated_html_element_type_helpers", - ":make_core_generated_svg_names", - ":make_core_generated_svg_element_type_helpers", ":make_core_generated_event_factory", ":make_core_generated_event_names", ":make_core_generated_event_target_names", - ":make_core_generated_math_ml_names", - ":make_core_generated_fetch_initiator_type_names", ":make_core_generated_event_type_names", + ":make_core_generated_fetch_initiator_type_names", + ":make_core_generated_html_element_factory", + ":make_core_generated_html_element_lookup_trie", + ":make_core_generated_html_element_type_helpers", + ":make_core_generated_html_entity_table", ":make_core_generated_html_tokenizer_names", ":make_core_generated_input_type_names", + ":make_core_generated_make_token_matcher_for_viewport", + ":make_core_generated_math_ml_names", + ":make_core_generated_media_feature_names", + ":make_core_generated_media_features", + ":make_core_generated_media_type_names", + ":make_core_generated_private_script", + ":make_core_generated_private_script_for_testing", + ":make_core_generated_style_builder", + ":make_core_generated_style_property_shorthand", + ":make_core_generated_svg_element_type_helpers", + ":make_core_generated_svg_names", ":make_core_generated_xlink_names", - ":make_core_generated_xml_ns_names", ":make_core_generated_xml_names", - ":make_core_generated_make_token_matcher_for_viewport", - ":make_core_generated_html_element_lookup_trie", - ":make_core_generated_bison", + ":make_core_generated_xml_ns_names", ] } diff --git a/third_party/WebKit/Source/devtools/BUILD.gn b/third_party/WebKit/Source/devtools/BUILD.gn index c50d3202bcd612..812901482235ff 100644 --- a/third_party/WebKit/Source/devtools/BUILD.gn +++ b/third_party/WebKit/Source/devtools/BUILD.gn @@ -75,13 +75,13 @@ visibility = [ "//third_party/WebKit/*" ] group("devtools_frontend_resources") { public_deps = [ + ":build_applications", ":copy_compatibility_scripts", - ":copy_inspector_images", ":copy_emulated_devices_images", + ":copy_inspector_images", ":devtools_extension_api", ":frontend_protocol_sources", ":supported_css_properties", - ":build_applications", ] if (!debug_devtools) { @@ -265,8 +265,8 @@ action("build_applications") { ] deps = [ - ":supported_css_properties", ":frontend_protocol_sources", + ":supported_css_properties", ] if (debug_devtools) { @@ -324,9 +324,9 @@ if (debug_devtools) { # Debug: copy non-module directories and core into resources_out_dir as-is. group("copy_debug_non_modules") { public_deps = [ - ":copy_runtime_core", ":copy_acorn_js_files", ":copy_codemirror_files", + ":copy_runtime_core", ] } diff --git a/third_party/WebKit/Source/modules/BUILD.gn b/third_party/WebKit/Source/modules/BUILD.gn index 4a7d6fba21d24e..3d2f575c830ebf 100644 --- a/third_party/WebKit/Source/modules/BUILD.gn +++ b/third_party/WebKit/Source/modules/BUILD.gn @@ -98,8 +98,8 @@ action("module_names") { # GYP version: WebKit/Source/modules/modules_generated.gyp:make_modules_generated group("make_modules_generated") { public_deps = [ - "//third_party/WebKit/Source/core:core_event_interfaces", - "//third_party/WebKit/Source/bindings/modules:bindings_modules_generated", ":module_names", + "//third_party/WebKit/Source/bindings/modules:bindings_modules_generated", + "//third_party/WebKit/Source/core:core_event_interfaces", ] } diff --git a/third_party/WebKit/Source/web/BUILD.gn b/third_party/WebKit/Source/web/BUILD.gn index 779c63390ef5cb..7bb2b71fa45abe 100644 --- a/third_party/WebKit/Source/web/BUILD.gn +++ b/third_party/WebKit/Source/web/BUILD.gn @@ -21,13 +21,13 @@ component("web") { output_name = "blink_web" deps = [ + "//skia", "//third_party/WebKit/Source/core", "//third_party/WebKit/Source/modules", "//third_party/WebKit/Source/platform", - "//skia", + "//third_party/angle:translator", "//third_party/icu", "//v8", - "//third_party/angle:translator", ] include_dirs = [ "//third_party/skia/include/utils" ] @@ -105,8 +105,8 @@ test("webkit_unit_tests") { ":test_support", ":web", "//base", - "//base/test:test_support", "//base:i18n", + "//base/test:test_support", "//content/test:test_support", "//testing/gmock", "//testing/gtest", diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn index bf800255d473fd..dde23d0559b5f8 100644 --- a/third_party/WebKit/public/BUILD.gn +++ b/third_party/WebKit/public/BUILD.gn @@ -19,8 +19,8 @@ group("blink") { public_deps = [ ":blink_headers", ":blink_minimal", - "//third_party/WebKit/Source/web", "//third_party/WebKit/Source/platform", + "//third_party/WebKit/Source/web", ] } diff --git a/third_party/android_media/BUILD.gn b/third_party/android_media/BUILD.gn index 96bba5a9326371..3316f4b12d717d 100644 --- a/third_party/android_media/BUILD.gn +++ b/third_party/android_media/BUILD.gn @@ -19,9 +19,9 @@ android_library("android_media_java") { DEPRECATED_java_in_dir = "java/src" deps = [ ":android_media_resources", + "//third_party/android_tools:android_support_v13_java", + "//third_party/android_tools:android_support_v7_appcompat_java", "//third_party/android_tools:android_support_v7_mediarouter_java", "//third_party/android_tools:android_support_v7_mediarouter_resources", - "//third_party/android_tools:android_support_v7_appcompat_java", - "//third_party/android_tools:android_support_v13_java", ] } diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn index 43217012502a10..b308eb00ce7ba0 100644 --- a/third_party/cld_2/BUILD.gn +++ b/third_party/cld_2/BUILD.gn @@ -113,8 +113,8 @@ static_library("cld2_static") { ] public_deps = [ - ":cld_2", ":cld2_data", + ":cld_2", ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ diff --git a/third_party/custom_tabs_client/BUILD.gn b/third_party/custom_tabs_client/BUILD.gn index 830c70a86af4c5..443424c139850b 100644 --- a/third_party/custom_tabs_client/BUILD.gn +++ b/third_party/custom_tabs_client/BUILD.gn @@ -16,8 +16,8 @@ android_apk("custom_tabs_client_example_apk") { apk_name = "CustomTabsClientExample" deps = [ ":chrome_tabs_client_example_apk_resources", - ":custom_tabs_support_lib", ":custom_tabs_client_shared_lib", + ":custom_tabs_support_lib", ] chromium_code = false } diff --git a/third_party/fontconfig/BUILD.gn b/third_party/fontconfig/BUILD.gn index 9af485fe51793c..d77d84da297862 100644 --- a/third_party/fontconfig/BUILD.gn +++ b/third_party/fontconfig/BUILD.gn @@ -52,8 +52,8 @@ component("fontconfig") { ] deps = [ - "//third_party/zlib", "//third_party/libxml", + "//third_party/zlib", ] configs -= [ "//build/config/compiler:chromium_code" ] diff --git a/third_party/freetype-android/BUILD.gn b/third_party/freetype-android/BUILD.gn index db8c6299540af0..439216228e589c 100644 --- a/third_party/freetype-android/BUILD.gn +++ b/third_party/freetype-android/BUILD.gn @@ -15,28 +15,28 @@ source_set("freetype") { sources = [ # The following files are not sorted alphabetically, but in the # same order as in Android.mk to ease maintenance. + "src/src/autofit/autofit.c", + "src/src/base/ftbase.c", "src/src/base/ftbbox.c", "src/src/base/ftbitmap.c", "src/src/base/ftfntfmt.c", "src/src/base/ftfstype.c", + "src/src/base/ftgasp.c", "src/src/base/ftglyph.c", + "src/src/base/ftinit.c", "src/src/base/ftlcdfil.c", + "src/src/base/ftmm.c", "src/src/base/ftstroke.c", - "src/src/base/fttype1.c", - "src/src/base/ftbase.c", "src/src/base/ftsystem.c", - "src/src/base/ftinit.c", - "src/src/base/ftgasp.c", - "src/src/base/ftmm.c", + "src/src/base/fttype1.c", + "src/src/cff/cff.c", "src/src/gzip/ftgzip.c", + "src/src/pshinter/pshinter.c", + "src/src/psnames/psnames.c", "src/src/raster/raster.c", "src/src/sfnt/sfnt.c", "src/src/smooth/smooth.c", - "src/src/autofit/autofit.c", "src/src/truetype/truetype.c", - "src/src/cff/cff.c", - "src/src/psnames/psnames.c", - "src/src/pshinter/pshinter.c", ] defines = [ diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 40fdf6580fe5f4..45f7c518180718 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -109,8 +109,8 @@ group("jingle_deps") { ] deps = [ "//base", - "//net", "//crypto:platform", + "//net", ] } @@ -233,8 +233,8 @@ static_library("libjingle") { ":jingle_deps", ] deps = [ - "//third_party/webrtc/base:rtc_base", ":libjingle_p2p_constants", + "//third_party/webrtc/base:rtc_base", ] # From libjingle_common.gypi's conditions list. @@ -492,8 +492,8 @@ if (enable_webrtc) { ] deps = [ - "//third_party/webrtc/base:rtc_base", ":libjingle_webrtc_common", + "//third_party/webrtc/base:rtc_base", ] } } # enable_webrtc diff --git a/third_party/libphonenumber/BUILD.gn b/third_party/libphonenumber/BUILD.gn index edd808a66d741d..b72c2ad7c87738 100644 --- a/third_party/libphonenumber/BUILD.gn +++ b/third_party/libphonenumber/BUILD.gn @@ -113,8 +113,8 @@ test("libphonenumber_unittests") { "//base", "//base/test:run_all_unittests", "//base/third_party/dynamic_annotations", - "//third_party/icu", "//testing/gmock", "//testing/gtest", + "//third_party/icu", ] } diff --git a/third_party/libvpx_new/BUILD.gn b/third_party/libvpx_new/BUILD.gn index e04887161c12d1..e73f5100a40e84 100644 --- a/third_party/libvpx_new/BUILD.gn +++ b/third_party/libvpx_new/BUILD.gn @@ -277,13 +277,13 @@ static_library("libvpx_new") { deps = [] if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) { deps += [ - ":libvpx_yasm", + ":libvpx_intrinsics_avx", + ":libvpx_intrinsics_avx2", ":libvpx_intrinsics_mmx", ":libvpx_intrinsics_sse2", - ":libvpx_intrinsics_ssse3", ":libvpx_intrinsics_sse4_1", - ":libvpx_intrinsics_avx", - ":libvpx_intrinsics_avx2", + ":libvpx_intrinsics_ssse3", + ":libvpx_yasm", ] } if (cpu_arch_full == "arm-neon-cpu-detect") { diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn index 5ea0f305de7b4d..488b92fb9811dc 100644 --- a/third_party/mesa/BUILD.gn +++ b/third_party/mesa/BUILD.gn @@ -717,8 +717,8 @@ if (!is_android) { # TODO(GYP) enable for Android. } deps = [ - ":mesa_headers", ":mesa", + ":mesa_headers", ":mesa_libglslcommon", "//build/config/sanitizers:deps", ] diff --git a/third_party/mockito/BUILD.gn b/third_party/mockito/BUILD.gn index 2f03b7c789babc..932788a0a84b4d 100644 --- a/third_party/mockito/BUILD.gn +++ b/third_party/mockito/BUILD.gn @@ -21,8 +21,8 @@ java_library("mockito_java") { deps = [ ":cglib_and_asm_java", ":objenesis_java", - "../junit:junit", "../junit:hamcrest", + "../junit:junit", ] DEPRECATED_java_in_dir = "src/src" } diff --git a/third_party/mojo/src/mojo/edk/embedder/BUILD.gn b/third_party/mojo/src/mojo/edk/embedder/BUILD.gn index 94d561f08d4708..d12b953d7b1c25 100644 --- a/third_party/mojo/src/mojo/edk/embedder/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/embedder/BUILD.gn @@ -138,8 +138,8 @@ source_set("embedder_unittests") { "//base", "//base/test:test_support", "//testing/gtest", - "//third_party/mojo/src/mojo/edk/test:test_support", "//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/edk/system:test_utils", + "//third_party/mojo/src/mojo/edk/test:test_support", ] } diff --git a/third_party/mojo/src/mojo/edk/js/BUILD.gn b/third_party/mojo/src/mojo/edk/js/BUILD.gn index 057c4e837dfa2d..303514ae955736 100644 --- a/third_party/mojo/src/mojo/edk/js/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/js/BUILD.gn @@ -11,8 +11,8 @@ group("tests") { testonly = true deps = [ - "test:js_unittests", "test:js_integration_tests", + "test:js_unittests", ] } diff --git a/third_party/mojo/src/mojo/edk/system/BUILD.gn b/third_party/mojo/src/mojo/edk/system/BUILD.gn index c782a78538892b..71dcac2594d1af 100644 --- a/third_party/mojo/src/mojo/edk/system/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/system/BUILD.gn @@ -145,8 +145,8 @@ component("system") { group("tests") { testonly = true deps = [ - ":mojo_system_unittests", ":mojo_message_pipe_perftests", + ":mojo_system_unittests", ] } diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn index 211c3d63b21b9d..790b53deeeafc0 100644 --- a/third_party/robolectric/BUILD.gn +++ b/third_party/robolectric/BUILD.gn @@ -25,7 +25,7 @@ java_prebuilt("robolectric_java") { jar_path = "lib/robolectric-2.4-jar-with-dependencies.jar" deps = [ ":android-all-4.3_r2-robolectric-0", - ":tagsoup-1.2", ":json-20080701", + ":tagsoup-1.2", ] } diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn index 803d0ab61188cd..66034cc6521b2a 100644 --- a/third_party/widevine/cdm/BUILD.gn +++ b/third_party/widevine/cdm/BUILD.gn @@ -125,9 +125,9 @@ if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) { ppapi_cdm_adapter("widevinecdmadapter") { defines = [] deps = [ - ":widevinecdmadapter_resources", - ":widevinecdm", ":version_h", + ":widevinecdm", + ":widevinecdmadapter_resources", "//ppapi/cpp", ] diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index 36937b801fa8ad..95903e8e07454e 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -299,10 +299,10 @@ if (current_toolchain == host_toolchain) { ":compile_gperf_for_include", ":compile_nasm_macros", ":compile_nasm_version", + ":compile_re2c", ":compile_re2c_lc3b", ":compile_win64_gas", ":compile_win64_nasm", - ":compile_re2c", ":generate_license", ":generate_module", ":generate_version", diff --git a/tools/android/heap_profiler/BUILD.gn b/tools/android/heap_profiler/BUILD.gn index dd8da99ee93a21..41366e5f932e99 100644 --- a/tools/android/heap_profiler/BUILD.gn +++ b/tools/android/heap_profiler/BUILD.gn @@ -54,8 +54,8 @@ executable("heap_profiler_integrationtest") { "heap_profiler_integrationtest.cc", ] deps = [ - "//testing/gtest", ":heap_profiler", + "//testing/gtest", ] configs -= [ "//build/config/compiler:chromium_code" ] diff --git a/tools/android/kerberos/SpnegoAuthenticator/BUILD.gn b/tools/android/kerberos/SpnegoAuthenticator/BUILD.gn index 03fc64de024657..3ce7ea4ec2f5f5 100644 --- a/tools/android/kerberos/SpnegoAuthenticator/BUILD.gn +++ b/tools/android/kerberos/SpnegoAuthenticator/BUILD.gn @@ -12,9 +12,9 @@ android_apk("spnego_authenticator_apk") { apk_name = "SpnegoAuthenticator" deps = [ + ":spnego_authenticator_apk_assets", "//base:base_java", "//net/android:net_java", - ":spnego_authenticator_apk_assets", ] java_files = [ diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn index 1b5b547ffb1c2d..412f4d79b5d22d 100644 --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn @@ -43,12 +43,12 @@ component("android") { defines = [ "UI_ANDROID_IMPLEMENTATION" ] deps = [ + ":ui_android_jni_headers", "//base", "//cc", "//skia", "//ui/gfx", "//ui/gfx/geometry", - ":ui_android_jni_headers", ] } @@ -143,8 +143,8 @@ android_library("ui_javatests") { DEPRECATED_java_in_dir = "javatests/src" testonly = true deps = [ - ":ui_java_resources", ":ui_java", + ":ui_java_resources", "//base:base_java", "//base:base_java_test_support", ] diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn index 7261a6e7f2d04e..090eaf178223e7 100644 --- a/ui/app_list/BUILD.gn +++ b/ui/app_list/BUILD.gn @@ -245,22 +245,22 @@ if (is_linux && !is_chromeos) { "//content", "//content/public/browser", "//skia", - "//url", "//ui/base", "//ui/events", "//ui/resources", "//ui/resources:ui_test_pak", "//ui/views", - "//ui/views_content_client", "//ui/views/controls/webview", + "//ui/views_content_client", + "//url", ] if (is_win) { configs -= [ "//build/config/win:console" ] configs += [ "//build/config/win:windowed" ] deps += [ - "//sandbox", "//content:sandbox_helper_win", + "//sandbox", ] } } diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn index 16820f69def66a..2e0f78c9b74163 100644 --- a/ui/aura/BUILD.gn +++ b/ui/aura/BUILD.gn @@ -231,8 +231,8 @@ executable("demo") { ":aura", ":test_support", "//base", - "//build/config/sanitizers:deps", "//base:i18n", + "//build/config/sanitizers:deps", "//skia", "//third_party/icu", "//ui/base", @@ -306,8 +306,8 @@ test("aura_unittests") { "//testing/gtest", "//ui/base:test_support", "//ui/compositor:test_support", - "//ui/events:test_support", "//ui/events:gesture_detection", + "//ui/events:test_support", "//ui/gfx", "//ui/gfx/geometry", "//ui/gl", diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 61caad57015eff..a17bc1116ce799 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -320,15 +320,15 @@ component("base") { public_deps = [ "//base", "//skia", - "//ui/events/platform", "//ui/events:events_base", + "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", ] deps = [ - "//base/third_party/dynamic_annotations", "//base:base_static", "//base:i18n", + "//base/third_party/dynamic_annotations", "//net", "//third_party/icu", "//ui/events", diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn index 91696799255094..b915757c0d4b80 100644 --- a/ui/base/ime/BUILD.gn +++ b/ui/base/ime/BUILD.gn @@ -105,8 +105,8 @@ component("ime") { deps = [ "//base", - "//base/third_party/dynamic_annotations", "//base:i18n", + "//base/third_party/dynamic_annotations", "//net", "//third_party/icu", "//ui/base", @@ -181,8 +181,8 @@ component("ime") { if (use_ozone) { deps += [ - "//ui/ozone", "//ui/events/ozone:events_ozone_layout", + "//ui/ozone", ] } } diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn index dcc25568a2ec98..6c121919c8babf 100644 --- a/ui/compositor/BUILD.gn +++ b/ui/compositor/BUILD.gn @@ -86,9 +86,9 @@ component("compositor") { # TODO(sky): before we make this real need to remove # IDR_BITMAP_BRUSH_IMAGE. deps += [ - "//ui/resources", "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", + "//ui/resources", ] } } @@ -130,8 +130,8 @@ source_set("test_support") { deps = [ "//base/test:test_support", "//cc", - "//cc/surfaces", "//cc:test_support", + "//cc/surfaces", "//gpu/command_buffer/client:gl_in_process_context", "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", diff --git a/ui/file_manager/BUILD.gn b/ui/file_manager/BUILD.gn index c6a7c999d2cfd2..369a695a25bea7 100644 --- a/ui/file_manager/BUILD.gn +++ b/ui/file_manager/BUILD.gn @@ -22,8 +22,8 @@ component("file_manager") { "file_manager_resource_util.h", ] deps = [ - "//base", ":resources", + "//base", ] defines = [ "FILE_MANAGER_IMPLEMENTATION" ] } diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index 114d476ace4b26..c70843de96311c 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -258,8 +258,8 @@ component("gfx") { deps = [ ":gfx_export", "//base", - "//base:i18n", "//base:base_static", + "//base:i18n", "//base/third_party/dynamic_annotations", "//skia", "//third_party/harfbuzz-ng", @@ -687,10 +687,10 @@ test("gfx_unittests") { "//base", "//base/test:test_support", "//skia", + "//testing/gtest", "//third_party/icu:icuuc", "//third_party/libpng", "//third_party/zlib", - "//testing/gtest", "//ui/base", "//ui/gfx/geometry", "//ui/resources:ui_test_pak", diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn index 4600fbcce8f3dd..a1ce72c1868cc9 100644 --- a/ui/keyboard/BUILD.gn +++ b/ui/keyboard/BUILD.gn @@ -142,8 +142,8 @@ test("keyboard_unittests") { "//testing/gtest", "//ui/aura:test_support", "//ui/base", - "//ui/base/ime", "//ui/base:test_support", + "//ui/base/ime", "//ui/compositor:test_support", "//ui/events:test_support", "//ui/gfx", diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn index 6139e1e1e74770..850dc2d7779e32 100644 --- a/ui/message_center/BUILD.gn +++ b/ui/message_center/BUILD.gn @@ -115,9 +115,9 @@ component("message_center") { "views/toast_contents_view.h", ] deps += [ + "//ui/compositor", "//ui/events", "//ui/views", - "//ui/compositor", ] } diff --git a/ui/ozone/platform/cast/BUILD.gn b/ui/ozone/platform/cast/BUILD.gn index 4e82eb1df9df02..5d2a21bda77831 100644 --- a/ui/ozone/platform/cast/BUILD.gn +++ b/ui/ozone/platform/cast/BUILD.gn @@ -34,8 +34,8 @@ source_set("cast") { deps = [ "//base", - "//chromecast/media/base:message_loop", "//chromecast/graphics:libcast_graphics_1.0", + "//chromecast/media/base:message_loop", "//ui/gfx", "//ui/gfx/geometry", "//ui/ozone:ozone_base", diff --git a/ui/ozone/platform/headless/BUILD.gn b/ui/ozone/platform/headless/BUILD.gn index fb731a26c2ae6f..e473a6204d471b 100644 --- a/ui/ozone/platform/headless/BUILD.gn +++ b/ui/ozone/platform/headless/BUILD.gn @@ -20,8 +20,8 @@ source_set("headless") { "//base", "//skia", "//ui/base", - "//ui/gfx/geometry", "//ui/events/ozone:events_ozone_layout", "//ui/events/platform", + "//ui/gfx/geometry", ] } diff --git a/ui/platform_window/android/BUILD.gn b/ui/platform_window/android/BUILD.gn index aae7a978746e47..3a1f6d4478d89d 100644 --- a/ui/platform_window/android/BUILD.gn +++ b/ui/platform_window/android/BUILD.gn @@ -20,14 +20,14 @@ component("android") { defines = [ "ANDROID_WINDOW_IMPLEMENTATION" ] deps = [ + ":jni_headers", + ":platform_window_java", "//base", "//skia", "//ui/events:events", "//ui/events:events_base", "//ui/gfx", "//ui/gfx/geometry", - ":jni_headers", - ":platform_window_java", ] libs = [ "android" ] diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn index 414f145354662b..eaf4646b4ea79e 100644 --- a/ui/resources/BUILD.gn +++ b/ui/resources/BUILD.gn @@ -67,8 +67,8 @@ if (!is_mac) { if (is_ios || is_mac) { group("ui_test_pak") { public_deps = [ - ":repack_ui_test_pak", ":repack_ui_test_mac_locale_pack", + ":repack_ui_test_pak", ] } } else { diff --git a/ui/shell_dialogs/BUILD.gn b/ui/shell_dialogs/BUILD.gn index 9696e9839fd87a..4ecd64c4f477a0 100644 --- a/ui/shell_dialogs/BUILD.gn +++ b/ui/shell_dialogs/BUILD.gn @@ -84,8 +84,8 @@ test("shell_dialogs_unittests") { deps = [ ":shell_dialogs", "//base", - "//base/test:test_support", "//base/test:run_all_unittests", + "//base/test:test_support", "//testing/gtest", ] } diff --git a/ui/strings/BUILD.gn b/ui/strings/BUILD.gn index 82cad9f315529f..b5f471a8cb001c 100644 --- a/ui/strings/BUILD.gn +++ b/ui/strings/BUILD.gn @@ -8,8 +8,8 @@ import("//tools/grit/grit_rule.gni") # targets want both. You can depend on the individually if you need to. group("strings") { public_deps = [ - ":ui_strings", ":app_locale_settings", + ":ui_strings", ] } diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index 12187f5b72ad01..dd376098cb0618 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -200,11 +200,11 @@ test("views_unittests") { "//third_party/icu", "//ui/accessibility", "//ui/base", - "//ui/base/ime", "//ui/base:test_support", + "//ui/base/ime", "//ui/compositor:test_support", - "//ui/events:test_support", "//ui/events:events_base", + "//ui/events:test_support", "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", diff --git a/ui/views/examples/BUILD.gn b/ui/views/examples/BUILD.gn index 03db107d7b91de..68e05ef6ab0555 100644 --- a/ui/views/examples/BUILD.gn +++ b/ui/views/examples/BUILD.gn @@ -103,8 +103,8 @@ executable("views_examples_exe") { deps = [ ":views_examples_lib", "//base", - "//build/config/sanitizers:deps", "//base:i18n", + "//build/config/sanitizers:deps", "//ui/base", "//ui/compositor", "//ui/compositor:test_support", diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn index 5ab84dc6720f61..d3b39a2b2e57d7 100644 --- a/ui/views/mus/BUILD.gn +++ b/ui/views/mus/BUILD.gn @@ -48,7 +48,6 @@ component("mus") { "//components/mus/public/interfaces", "//components/resource_provider/public/cpp", "//components/resource_provider/public/interfaces", - "//skia", "//mojo/application/public/cpp", "//mojo/application/public/interfaces", "//mojo/converters/geometry", @@ -59,6 +58,7 @@ component("mus") { "//mojo/platform_handle:for_component", "//mojo/public/c/system:for_component", "//mojo/public/cpp/bindings", + "//skia", "//third_party/icu", "//ui/aura", "//ui/compositor", @@ -93,8 +93,8 @@ repack("resources") { ] output = "$root_out_dir/views_mus_resources.pak" deps = [ - "//ui/strings", "//ui/resources", + "//ui/strings", "//ui/views/resources", ] } diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn index 1c113756272716..39fb4c0ec50e5f 100644 --- a/ui/wm/BUILD.gn +++ b/ui/wm/BUILD.gn @@ -81,9 +81,9 @@ component("wm") { "//ui/base/ime", "//ui/compositor", "//ui/events", + "//ui/events:events_base", "//ui/events/devices", "//ui/events/platform", - "//ui/events:events_base", "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", diff --git a/url/BUILD.gn b/url/BUILD.gn index 7cedd400ed8b0a..2f3678c7ca7d92 100644 --- a/url/BUILD.gn +++ b/url/BUILD.gn @@ -66,8 +66,8 @@ component("url") { deps = [ "//base", "//base/third_party/dynamic_annotations", - "//third_party/icu:icudata", "//third_party/icu", + "//third_party/icu:icudata", ] } diff --git a/win8/BUILD.gn b/win8/BUILD.gn index a064c153b5cfe6..1d4343d04bc03c 100644 --- a/win8/BUILD.gn +++ b/win8/BUILD.gn @@ -11,11 +11,11 @@ source_set("metro_viewer_constants") { component("metro_viewer") { deps = [ + ":metro_viewer_constants", "//base", "//ipc", "//ui/aura", "//ui/metro_viewer", - ":metro_viewer_constants", ] sources = [ "viewer/metro_viewer_process_host.cc", @@ -26,8 +26,8 @@ component("metro_viewer") { source_set("test_support_win8") { deps = [ - "//base", ":test_registrar_constants", + "//base", ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.