Skip to content

Commit

Permalink
[Cleanup] gn format all the gn files
Browse files Browse the repository at this point in the history
find . -name '*.gn' -o '*.gni' -exec gn format {} \;

Change-Id: Ib9a441cbf022c9dafb815b97cb868c83d6e9b5d7
Reviewed-on: https://chromium-review.googlesource.com/589822
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Brett Wilson <brettw@chromium.org>
Commit-Queue: Mike Bjorge <mbjorge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490165}
  • Loading branch information
Mike Bjorge authored and Commit Bot committed Jul 28, 2017
1 parent e8db841 commit b7bf5b9
Show file tree
Hide file tree
Showing 19 changed files with 187 additions and 180 deletions.
3 changes: 2 additions & 1 deletion build/config/compiler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@ config("compiler") {
# TODO(pcc): Make this conditional on is_official_build rather than on gn
# flags for specific features.
if (!is_debug && (allow_posix_link_time_opt || is_cfi) && !is_nacl) {
assert(use_lld || target_os == "chromeos", "gold plugin only supported with ChromeOS")
assert(use_lld || target_os == "chromeos",
"gold plugin only supported with ChromeOS")

if (use_thin_lto) {
cflags += [ "-flto=thin" ]
Expand Down
2 changes: 1 addition & 1 deletion build/config/features.gni
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ declare_args() {
!(is_linux && target_cpu == "arm64")

# Non-SFI is not yet supported on mipsel
enable_nacl_nonsfi = (current_cpu != "mipsel" && current_cpu != "mips64el")
enable_nacl_nonsfi = current_cpu != "mipsel" && current_cpu != "mips64el"

# Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4.
# We always build Google Chrome and Chromecast with proprietary codecs.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ group("stack_py") {
sources = _py_files
data = sources

data += ["${android_tool_prefix}addr2line",
"${android_tool_prefix}objdump",
"${android_tool_prefix}c++filt"]
data += [
"${android_tool_prefix}addr2line",
"${android_tool_prefix}objdump",
"${android_tool_prefix}c++filt",
]
}
2 changes: 0 additions & 2 deletions build/toolchain/linux/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ clang_toolchain("clang_mips64el") {
}
}


gcc_toolchain("mipsel") {
cc = "mipsel-linux-gnu-gcc"
cxx = "mipsel-linux-gnu-g++"
Expand Down Expand Up @@ -212,7 +211,6 @@ gcc_toolchain("mips64el") {
}
}


gcc_toolchain("s390x") {
cc = "gcc"
cxx = "g++"
Expand Down
28 changes: 14 additions & 14 deletions chrome/test/vr/perf/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ common_data = [
group("motopho_latency_test") {
testonly = true
data = common_data + [
"./latency/__init__.py",
"./latency/android_webvr_latency_test.py",
"./latency/latency_test_config.py",
"./latency/motopho_thread.py",
"./latency/robot_arm.py",
"./latency/run_latency_test.py",
"./latency/webvr_latency_test.py",
]
"./latency/__init__.py",
"./latency/android_webvr_latency_test.py",
"./latency/latency_test_config.py",
"./latency/motopho_thread.py",
"./latency/robot_arm.py",
"./latency/run_latency_test.py",
"./latency/webvr_latency_test.py",
]
data_deps = [
"//chrome/android:chrome_public_apk",
]
Expand All @@ -30,12 +30,12 @@ group("motopho_latency_test") {
group("vrcore_fps_test") {
testonly = true
data = common_data + [
"./vrcore_fps/__init__.py",
"./vrcore_fps/run_vrcore_fps_test.py",
"./vrcore_fps/vrcore_fps_test.py",
"./vrcore_fps/vrcore_fps_test_config.py",
"./vrcore_fps/vr_perf_summary.py",
]
"./vrcore_fps/__init__.py",
"./vrcore_fps/run_vrcore_fps_test.py",
"./vrcore_fps/vrcore_fps_test.py",
"./vrcore_fps/vrcore_fps_test_config.py",
"./vrcore_fps/vr_perf_summary.py",
]
data_deps = [
"//chrome/android:chrome_public_apk",
]
Expand Down
5 changes: 2 additions & 3 deletions components/url_formatter/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ android_library("url_formatter_java") {
"//base:base_java",
]

java_files = [
"java/src/org/chromium/components/url_formatter/UrlFormatter.java",
]
java_files =
[ "java/src/org/chromium/components/url_formatter/UrlFormatter.java" ]
}

generate_jni("jni_headers") {
Expand Down
12 changes: 3 additions & 9 deletions ipc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,9 @@ component("ipc") {
]

if (!is_nacl_nonsfi) {
sources += [
"ipc_message_protobuf_utils.h",
]
sources += [ "ipc_message_protobuf_utils.h" ]

public_deps += [
"//third_party/protobuf:protobuf_lite",
]
public_deps += [ "//third_party/protobuf:protobuf_lite" ]
}

deps = [
Expand Down Expand Up @@ -245,9 +241,7 @@ if (!is_ios) {
}

if (!is_nacl_nonsfi) {
sources += [
"ipc_message_protobuf_utils_unittest.cc",
]
sources += [ "ipc_message_protobuf_utils_unittest.cc" ]
}
}

Expand Down
2 changes: 1 addition & 1 deletion remoting/client/input/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ source_set("normalizing_input_filter") {

deps = [
"//remoting/base",
"//third_party/webrtc/rtc_base:rtc_base_approved",
"//third_party/webrtc/modules/desktop_capture:primitives",
"//third_party/webrtc/rtc_base:rtc_base_approved",
"//ui/events:dom_keycode_converter",
]
}
Expand Down
4 changes: 3 additions & 1 deletion remoting/host/mac/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ source_set("constants") {
"constants_mac.h",
]

deps = [ "//remoting/host:remoting_version" ]
deps = [
"//remoting/host:remoting_version",
]
}

# remoting_me2me_host-InfoPlist.strings
Expand Down
2 changes: 1 addition & 1 deletion remoting/protocol/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ static_library("protocol") {
"connection_to_host.h",
"content_description.cc",
"content_description.h",
"datagram_channel_factory.h",
"data_channel_manager.cc",
"data_channel_manager.h",
"datagram_channel_factory.h",
"errors.cc",
"errors.h",
"frame_consumer.h",
Expand Down
3 changes: 2 additions & 1 deletion third_party/WebKit/Source/bindings/core/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import("//third_party/WebKit/Source/core/core_idl_files.gni")
visibility = [ "//third_party/WebKit/*" ]

compute_interfaces_info_individual("interfaces_info_individual_core") {
sources = core_static_interface_idl_files + core_static_dependency_idl_files +
sources =
core_static_interface_idl_files + core_static_dependency_idl_files +
core_generated_interface_idl_files + core_generated_dependency_idl_files
interfaces_info_file =
"$bindings_core_output_dir/InterfacesInfoCoreIndividual.pickle"
Expand Down
26 changes: 19 additions & 7 deletions third_party/brotli/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,18 @@ common_sources = [
static_library("common") {
sources = common_sources
public_configs = [ ":includes" ]
deps = [ ":headers" ]
deps = [
":headers",
]
}

static_library("common_no_dictionary_data") {
sources = common_sources
public_configs = [ ":includes" ]
deps = [ ":headers" ]
defines = ["BROTLI_EXTERNAL_DICTIONARY_DATA"]
deps = [
":headers",
]
defines = [ "BROTLI_EXTERNAL_DICTIONARY_DATA" ]
}

dec_sources = [
Expand All @@ -58,8 +62,12 @@ dec_sources = [
static_library("dec") {
sources = dec_sources
public_configs = [ ":includes" ]
public_deps = [ ":headers" ]
deps = [ ":common" ]
public_deps = [
":headers",
]
deps = [
":common",
]

configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
Expand All @@ -72,8 +80,12 @@ static_library("dec") {
static_library("dec_no_dictionary_data") {
sources = dec_sources
public_configs = [ ":includes" ]
public_deps = [ ":headers" ]
deps = [ ":common_no_dictionary_data" ]
public_deps = [
":headers",
]
deps = [
":common_no_dictionary_data",
]

configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
Expand Down
2 changes: 1 addition & 1 deletion third_party/libjingle_xmpp/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ rtc_test("libjingle_xmpp_unittests") {
deps = [
":libjingle_xmpp",
":rtc_task_runner",

"//base/test:run_all_unittests",
"//base/test:test_support",

# TODO(kjellander): Refactor/remove this dependency. It is needed by
# third_party/webrtc_overrides/webrtc/rtc_base/win32socketinit.cc.
"//net",
Expand Down
4 changes: 2 additions & 2 deletions third_party/libphonenumber/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ config("libphonenumber_config") {
"dist/cpp/src",
"$root_gen_dir/third_party/libphonenumber",
]
defines = [
defines = [
"I18N_PHONENUMBERS_USE_ICU_REGEXP=1",
"I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS=1"
"I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS=1",
]
if (!is_android) {
defines += [ "I18N_PHONENUMBERS_NO_THREAD_SAFETY=1" ]
Expand Down
4 changes: 2 additions & 2 deletions third_party/libxslt/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ config("libxslt_warnings") {

static_library("libxslt") {
sources = [
"linux/config.h",
"mac/config.h",
"src/libxslt/attributes.c",
"src/libxslt/attributes.h",
"src/libxslt/attrvt.c",
Expand Down Expand Up @@ -67,8 +69,6 @@ static_library("libxslt") {
"src/libxslt/xsltutils.c",
"src/libxslt/xsltutils.h",
"src/libxslt/xsltwin32config.h",
"linux/config.h",
"mac/config.h",
"win32/config.h",
]

Expand Down
2 changes: 1 addition & 1 deletion third_party/mach_override/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static_library("libudis86") {
"//build/config/compiler:chromium_code",

# For UD_ASSERT(!"message");
"//build/config/clang:extra_warnings",
"//build/config/clang:extra_warnings",
]
configs += [
"//build/config/compiler:no_chromium_code",
Expand Down
4 changes: 1 addition & 3 deletions third_party/ocmock/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ source_set("ocmock") {
"//testing/gtest",
]
public_configs = [ ":ocmock_config" ]
configs -= [
"//build/config/compiler:chromium_code",
]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
":ocmock_warnings",
"//build/config/compiler:no_chromium_code",
Expand Down
2 changes: 1 addition & 1 deletion third_party/opus/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,8 @@ test("test_opus_api") {

test("test_opus_encode") {
sources = [
"src/tests/test_opus_encode.c",
"src/tests/opus_encode_regressions.c",
"src/tests/test_opus_encode.c",
]

configs -= [ "//build/config/compiler:chromium_code" ]
Expand Down
Loading

0 comments on commit b7bf5b9

Please sign in to comment.