Skip to content

Commit

Permalink
Run gn --format over all .gn files
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
agrieve authored and Commit bot committed Nov 20, 2015
1 parent 505f20a commit d7a71c8
Show file tree
Hide file tree
Showing 220 changed files with 587 additions and 596 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
}
}
Expand Down
16 changes: 8 additions & 8 deletions android_webview/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions android_webview/native/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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" ]
Expand Down
21 changes: 10 additions & 11 deletions ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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 -= [
Expand Down Expand Up @@ -245,7 +245,6 @@ static_library("ash_shell_lib") {
"//ash/strings",
"//base",
"//base:i18n",

"//net",
"//skia",
"//third_party/icu",
Expand Down Expand Up @@ -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",
]
}
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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 -= [
Expand Down
4 changes: 2 additions & 2 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions base/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions blimp/client/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
Expand Down
2 changes: 1 addition & 1 deletion blimp/engine/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions breakpad/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,9 @@ if (is_mac) {
include_dirs = [ "src/client/apple/Framework" ]

deps = [
":utilities",
":crash_inspector",
":crash_report_sender",
":utilities",
]
}

Expand Down Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions build/config/ios/rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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" ]
Expand Down
4 changes: 2 additions & 2 deletions build/config/mac/rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
}

Expand Down
2 changes: 1 addition & 1 deletion build/secondary/third_party/android_tools/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
6 changes: 3 additions & 3 deletions cc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -686,18 +686,18 @@ 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",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gfx:test_support",
"//ui/gfx/geometry",
"//ui/gl",
"//ui/gl:test_support",
]
Expand Down Expand Up @@ -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",
]
Expand Down
6 changes: 3 additions & 3 deletions cc/blink/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
}
}
8 changes: 4 additions & 4 deletions chrome/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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",
Expand All @@ -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",
]
Expand Down
Loading

0 comments on commit d7a71c8

Please sign in to comment.