zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat GN files.

Browse Source 
`gn format` recently [1] changed its formatting behavior
for deps, source, and a few other elements when they
are assigned (with =) single-element lists to be consistent
with the formatting of updates (with +=) with single-element.

Now that we've rolled in a GN binary with the change,
reformat all files so that people don't get presubmit
warnings due to this.

CL generated with:
$ git ls-files | grep BUILD.gn | xargs gn format
$ gn format build_overrides/build.gni
$ gn format build_overrides/gtest.gni
$ gn format modules/audio_coding/audio_coding.gni
$ gn format webrtc.gni
$ gn format .gn

Plus a few manual changes to add exceptions for
"public_deps" (after changing these lines the presubmit
started to complain).

[1] - https://gn-review.googlesource.com/c/gn/+/6860

Bug: webrtc:11302
Change-Id: Iac29d23c1618ebef925c972e2891cd9f4e8cd613
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166882
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30334}
This commit is contained in:
Mirko Bonadei
2020-01-21 12:10:10 +01:00
committed by Commit Bot
parent 0809e7ed43
commit ccbe95fd8a
67 changed files with 382 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/BUILD.gn
View File

@ -30,9 +30,7 @@ group("modules") {
}
rtc_source_set("module_api_public") {
sources = [
"include/module_common_types_public.h",
]
sources = [ "include/module_common_types_public.h" ]
deps = [
"..:webrtc_common",
"//third_party/abseil-cpp/absl/types:optional",
@ -54,9 +52,7 @@ rtc_library("module_api") {
rtc_source_set("module_fec_api") {
visibility = [ "*" ]
sources = [
"include/module_fec_types.h",
]
sources = [ "include/module_fec_types.h" ]
}
if (rtc_include_tests) {
@ -70,9 +66,7 @@ if (rtc_include_tests) {
bundle_data("modules_tests_bundle_data") {
testonly = true
sources = modules_tests_resources
outputs = [
"{{bundle_resources_dir}}/{{source_file_part}}",
]
outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
}
}
@ -114,9 +108,9 @@ if (rtc_include_tests) {
"../resources/audio_coding/neteq_opus.rtp",
"../resources/audio_coding/neteq_opus_dtx.rtp",
"../resources/audio_coding/neteq_universal_new.rtp",
"../resources/audio_coding/speech_4_channels_48k_one_second.wav",
"../resources/audio_coding/speech_mono_16kHz.pcm",
"../resources/audio_coding/speech_mono_32_48kHz.pcm",
"../resources/audio_coding/speech_4_channels_48k_one_second.wav",
"../resources/audio_coding/testfile32kHz.pcm",
"../resources/audio_coding/testfile_fake_stereo_32kHz.pcm",
"../resources/audio_coding/teststereo32kHz.pcm",
@ -196,8 +190,8 @@ if (rtc_include_tests) {
"../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin",
"../resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin",
"../resources/short_mixed_mono_48.dat",
"../resources/short_mixed_mono_48_arm.dat",
"../resources/short_mixed_mono_48.pcm",
"../resources/short_mixed_mono_48_arm.dat",
"../resources/short_mixed_stereo_48.dat",
"../resources/short_mixed_stereo_48.pcm",
"../resources/voice_engine/audio_tiny48.wav",
@ -206,18 +200,14 @@ if (rtc_include_tests) {
bundle_data("modules_unittests_bundle_data") {
testonly = true
sources = modules_unittests_resources
outputs = [
"{{bundle_resources_dir}}/{{source_file_part}}",
]
outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
}
}
rtc_test("modules_unittests") {
testonly = true
defines = []
sources = [
"module_common_types_unittest.cc",
]
sources = [ "module_common_types_unittest.cc" ]
deps = [
":module_api",

8
modules/audio_device/BUILD.gn
View File

@ -25,12 +25,8 @@ config("audio_device_warnings_config") {
rtc_source_set("audio_device_default") {
visibility = [ "*" ]
sources = [
"include/audio_device_default.h",
]
deps = [
":audio_device_api",
]
sources = [ "include/audio_device_default.h" ]
deps = [ ":audio_device_api" ]
}
rtc_source_set("audio_device") {

4
modules/audio_mixer/BUILD.gn
View File

@ -120,9 +120,7 @@ if (rtc_include_tests) {
rtc_executable("audio_mixer_test") {
testonly = true
sources = [
"audio_mixer_test.cc",
]
sources = [ "audio_mixer_test.cc" ]
deps = [
":audio_mixer_impl",

32
modules/audio_processing/BUILD.gn
View File

@ -212,19 +212,13 @@ rtc_library("audio_processing_statistics") {
}
rtc_source_set("audio_frame_view") {
sources = [
"include/audio_frame_view.h",
]
deps = [
"../../api:array_view",
]
sources = [ "include/audio_frame_view.h" ]
deps = [ "../../api:array_view" ]
}
rtc_source_set("audio_generator_interface") {
visibility = [ "*" ]
sources = [
"include/audio_generator.h",
]
sources = [ "include/audio_generator.h" ]
deps = [
":audio_frame_view",
"../../rtc_base:rtc_base_approved",
@ -263,9 +257,7 @@ rtc_library("file_audio_generator") {
if (rtc_enable_protobuf) {
proto_library("audioproc_debug_proto") {
sources = [
"debug.proto",
]
sources = [ "debug.proto" ]
proto_out_dir = "modules/audio_processing"
}
@ -289,9 +281,7 @@ rtc_library("apm_logging") {
if (rtc_include_tests) {
rtc_source_set("mocks") {
testonly = true
sources = [
"include/mock_audio_processing.h",
]
sources = [ "include/mock_audio_processing.h" ]
deps = [
":api",
":audio_buffer",
@ -450,9 +440,7 @@ if (rtc_include_tests) {
testonly = true
configs += [ ":apm_debug_dump" ]
sources = [
"audio_processing_performance_unittest.cc",
]
sources = [ "audio_processing_performance_unittest.cc" ]
deps = [
":audio_processing",
":audioproc_test_utils",
@ -468,9 +456,7 @@ if (rtc_include_tests) {
rtc_library("file_audio_generator_unittests") {
testonly = true
sources = [
"audio_generator/file_audio_generator_unittest.cc",
]
sources = [ "audio_generator/file_audio_generator_unittest.cc" ]
deps = [
":api",
@ -621,9 +607,7 @@ if (rtc_include_tests) {
if (rtc_enable_protobuf) {
proto_library("audioproc_unittest_proto") {
sources = [
"test/unittest.proto",
]
sources = [ "test/unittest.proto" ]
proto_out_dir = "modules/audio_processing/test"
}

16
modules/audio_processing/aec_dump/BUILD.gn
View File

@ -10,9 +10,7 @@ import("../../../webrtc.gni") # This contains def of 'rtc_enable_protobuf'
rtc_source_set("aec_dump") {
visibility = [ "*" ]
sources = [
"aec_dump_factory.h",
]
sources = [ "aec_dump_factory.h" ]
deps = [
"../",
@ -38,9 +36,7 @@ rtc_library("mock_aec_dump") {
rtc_library("mock_aec_dump_unittests") {
testonly = true
sources = [
"aec_dump_integration_test.cc",
]
sources = [ "aec_dump_integration_test.cc" ]
deps = [
":mock_aec_dump",
@ -92,17 +88,13 @@ if (rtc_enable_protobuf) {
"../../../test:test_support",
"//testing/gtest",
]
sources = [
"aec_dump_unittest.cc",
]
sources = [ "aec_dump_unittest.cc" ]
}
}
rtc_library("null_aec_dump_factory") {
assert_no_deps = [ ":aec_dump_impl" ]
sources = [
"null_aec_dump_factory.cc",
]
sources = [ "null_aec_dump_factory.cc" ]
deps = [
":aec_dump",

8
modules/audio_processing/agc/BUILD.gn
View File

@ -9,9 +9,7 @@
import("../../../webrtc.gni")
rtc_source_set("gain_control_interface") {
sources = [
"gain_control.h",
]
sources = [ "gain_control.h" ]
}
rtc_library("agc") {
@ -93,9 +91,7 @@ rtc_library("agc_legacy_c") {
}
rtc_source_set("gain_map") {
sources = [
"gain_map_internal.h",
]
sources = [ "gain_map_internal.h" ]
}
if (rtc_include_tests) {

8
modules/audio_processing/agc2/BUILD.gn
View File

@ -199,9 +199,7 @@ rtc_library("adaptive_digital_unittests") {
rtc_library("biquad_filter_unittests") {
testonly = true
sources = [
"biquad_filter_unittest.cc",
]
sources = [ "biquad_filter_unittest.cc" ]
deps = [
":biquad_filter",
"../../../rtc_base:gunit_helpers",
@ -260,9 +258,7 @@ rtc_library("noise_estimator_unittests") {
rtc_library("rnn_vad_with_level_unittests") {
testonly = true
sources = [
"vad_with_level_unittest.cc",
]
sources = [ "vad_with_level_unittest.cc" ]
deps = [
":rnn_vad_with_level",
"..:audio_frame_view",

10
modules/audio_processing/agc2/rnn_vad/BUILD.gn
View File

@ -76,8 +76,8 @@ if (rtc_include_tests) {
unittest_resources = [
"../../../../resources/audio_processing/agc2/rnn_vad/band_energies.dat",
"../../../../resources/audio_processing/agc2/rnn_vad/pitch_buf_24k.dat",
"../../../../resources/audio_processing/agc2/rnn_vad/pitch_search_int.dat",
"../../../../resources/audio_processing/agc2/rnn_vad/pitch_lp_res.dat",
"../../../../resources/audio_processing/agc2/rnn_vad/pitch_search_int.dat",
"../../../../resources/audio_processing/agc2/rnn_vad/samples.pcm",
"../../../../resources/audio_processing/agc2/rnn_vad/vad_prob.dat",
]
@ -86,9 +86,7 @@ if (rtc_include_tests) {
bundle_data("unittests_bundle_data") {
testonly = true
sources = unittest_resources
outputs = [
"{{bundle_resources_dir}}/{{source_file_part}}",
]
outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
}
}
@ -130,9 +128,7 @@ if (rtc_include_tests) {
rtc_executable("rnn_vad_tool") {
testonly = true
sources = [
"rnn_vad_tool.cc",
]
sources = [ "rnn_vad_tool.cc" ]
deps = [
":rnn_vad",
"../../../../api:array_view",

8
modules/audio_processing/legacy_ns/BUILD.gn
View File

@ -34,9 +34,7 @@ rtc_library("legacy_ns") {
rtc_library("legacy_ns_c") {
visibility = [ "*" ] # Only targets in this file can depend on this.
sources = [
"windows_private.h",
]
sources = [ "windows_private.h" ]
if (rtc_prefer_fixed_point) {
sources += [
@ -89,9 +87,7 @@ if (rtc_include_tests) {
testonly = true
configs += []
sources = [
"legacy_noise_suppression_unittest.cc",
]
sources = [ "legacy_noise_suppression_unittest.cc" ]
deps = [
"..:audio_buffer",

4
modules/audio_processing/ns/BUILD.gn
View File

@ -73,9 +73,7 @@ if (rtc_include_tests) {
testonly = true
configs += [ "..:apm_debug_dump" ]
sources = [
"noise_suppressor_unittest.cc",
]
sources = [ "noise_suppressor_unittest.cc" ]
deps = [
":ns",

8
modules/audio_processing/test/conversational_speech/BUILD.gn
View File

@ -10,16 +10,12 @@ import("../../../../webrtc.gni")
group("conversational_speech") {
testonly = true
deps = [
":conversational_speech_generator",
]
deps = [ ":conversational_speech_generator" ]
}
rtc_executable("conversational_speech_generator") {
testonly = true
sources = [
"generator.cc",
]
sources = [ "generator.cc" ]
deps = [
":lib",
"../../../../test:fileutils",

53
modules/audio_processing/test/py_quality_assessment/BUILD.gn
View File

@ -27,9 +27,7 @@ copy("scripts") {
"apm_quality_assessment_gencfgs.py",
"apm_quality_assessment_optimize.py",
]
outputs = [
"$root_build_dir/py_quality_assessment/{{source_file_part}}",
]
outputs = [ "$root_build_dir/py_quality_assessment/{{source_file_part}}" ]
deps = [
":apm_configs",
":lib",
@ -41,9 +39,7 @@ copy("scripts") {
copy("apm_configs") {
testonly = true
sources = [
"apm_configs/default.json",
]
sources = [ "apm_configs/default.json" ]
visibility = [ ":*" ] # Only targets in this file can depend on this.
outputs = [
"$root_build_dir/py_quality_assessment/apm_configs/{{source_file_part}}",
@ -77,23 +73,16 @@ copy("lib") {
"quality_assessment/test_data_generation_factory.py",
]
visibility = [ ":*" ] # Only targets in this file can depend on this.
outputs = [
"$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}",
]
deps = [
"../../../../resources/audio_processing/test/py_quality_assessment:noise_tracks",
]
outputs = [ "$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}" ]
deps = [ "../../../../resources/audio_processing/test/py_quality_assessment:noise_tracks" ]
}
copy("output") {
testonly = true
sources = [
"output/README.md",
]
sources = [ "output/README.md" ]
visibility = [ ":*" ] # Only targets in this file can depend on this.
outputs = [
"$root_build_dir/py_quality_assessment/output/{{source_file_part}}",
]
outputs =
[ "$root_build_dir/py_quality_assessment/output/{{source_file_part}}" ]
}
group("unit_tests") {
@ -110,9 +99,7 @@ group("unit_tests") {
rtc_executable("fake_polqa") {
testonly = true
sources = [
"quality_assessment/fake_polqa.cc",
]
sources = [ "quality_assessment/fake_polqa.cc" ]
visibility = [ ":*" ] # Only targets in this file can depend on this.
output_dir = "${root_out_dir}/py_quality_assessment/quality_assessment"
deps = [
@ -123,9 +110,7 @@ rtc_executable("fake_polqa") {
rtc_executable("vad") {
testonly = true
sources = [
"quality_assessment/vad.cc",
]
sources = [ "quality_assessment/vad.cc" ]
deps = [
"../../../../common_audio",
"../../../../rtc_base:rtc_base_approved",
@ -136,9 +121,7 @@ rtc_executable("vad") {
rtc_executable("apm_vad") {
testonly = true
sources = [
"quality_assessment/apm_vad.cc",
]
sources = [ "quality_assessment/apm_vad.cc" ]
deps = [
"../..",
"../../../../common_audio",
@ -151,9 +134,7 @@ rtc_executable("apm_vad") {
rtc_executable("sound_level") {
testonly = true
sources = [
"quality_assessment/sound_level.cc",
]
sources = [ "quality_assessment/sound_level.cc" ]
deps = [
"../..",
"../../../../common_audio",
@ -176,18 +157,12 @@ copy("lib_unit_tests") {
"quality_assessment/test_data_generation_unittest.py",
]
visibility = [ ":*" ] # Only targets in this file can depend on this.
outputs = [
"$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}",
]
outputs = [ "$root_build_dir/py_quality_assessment/quality_assessment/{{source_file_part}}" ]
}
copy("scripts_unit_tests") {
testonly = true
sources = [
"apm_quality_assessment_unittest.py",
]
sources = [ "apm_quality_assessment_unittest.py" ]
visibility = [ ":*" ] # Only targets in this file can depend on this.
outputs = [
"$root_build_dir/py_quality_assessment/{{source_file_part}}",
]
outputs = [ "$root_build_dir/py_quality_assessment/{{source_file_part}}" ]
}

16
modules/audio_processing/utility/BUILD.gn
View File

@ -27,9 +27,7 @@ rtc_library("legacy_delay_estimator") {
"delay_estimator_wrapper.cc",
"delay_estimator_wrapper.h",
]
deps = [
"../../../rtc_base:checks",
]
deps = [ "../../../rtc_base:checks" ]
}
rtc_library("ooura_fft") {
@ -91,9 +89,7 @@ if (rtc_include_tests) {
rtc_library("cascaded_biquad_filter_unittest") {
testonly = true
sources = [
"cascaded_biquad_filter_unittest.cc",
]
sources = [ "cascaded_biquad_filter_unittest.cc" ]
deps = [
":cascaded_biquad_filter",
"../../../rtc_base:rtc_base_approved",
@ -105,9 +101,7 @@ if (rtc_include_tests) {
rtc_library("legacy_delay_estimator_unittest") {
testonly = true
sources = [
"delay_estimator_unittest.cc",
]
sources = [ "delay_estimator_unittest.cc" ]
deps = [
":legacy_delay_estimator",
"../../../rtc_base:rtc_base_approved",
@ -118,9 +112,7 @@ if (rtc_include_tests) {
rtc_library("pffft_wrapper_unittest") {
testonly = true
sources = [
"pffft_wrapper_unittest.cc",
]
sources = [ "pffft_wrapper_unittest.cc" ]
deps = [
":pffft_wrapper",
"../../../test:test_support",

4
modules/congestion_controller/BUILD.gn
View File

@ -42,9 +42,7 @@ if (rtc_include_tests) {
rtc_library("congestion_controller_unittests") {
testonly = true
sources = [
"receive_side_congestion_controller_unittest.cc",
]
sources = [ "receive_side_congestion_controller_unittest.cc" ]
deps = [
":congestion_controller",
"../../system_wrappers",

16
modules/desktop_capture/BUILD.gn
View File

@ -132,9 +132,7 @@ if (rtc_include_tests) {
rtc_library("screen_drawer") {
testonly = true
public_deps = [
":desktop_capture",
]
public_deps = [ ":desktop_capture" ] # no-presubmit-check TODO(webrtc:8603)
sources = [
"screen_drawer.cc",
@ -172,9 +170,7 @@ if (rtc_include_tests) {
rtc_library("desktop_capture_mock") {
testonly = true
public_deps = [
":desktop_capture",
]
public_deps = [ ":desktop_capture" ] # no-presubmit-check TODO(webrtc:8603)
sources = [
"mock_desktop_capturer_callback.cc",
@ -207,9 +203,7 @@ if (is_linux) {
# the binary.
generate_stubs("pipewire_stubs") {
configs = [ "../../:common_config" ]
deps = [
"../../rtc_base",
]
deps = [ "../../rtc_base" ]
extra_header = "linux/pipewire_stub_header.fragment"
logging_function = "RTC_LOG(LS_VERBOSE)"
logging_include = "rtc_base/logging.h"
@ -230,9 +224,7 @@ if (is_linux) {
rtc_source_set("desktop_capture") {
visibility = [ "*" ]
public_deps = [
":desktop_capture_generic",
]
public_deps = [ ":desktop_capture_generic" ] # no-presubmit-check TODO(webrtc:8603)
if (is_mac) {
public_deps += [ ":desktop_capture_objc" ]
}

4
modules/remote_bitrate_estimator/BUILD.gn
View File

@ -82,9 +82,7 @@ if (!build_with_chromium) {
rtc_executable("rtp_to_text") {
testonly = true
sources = [
"tools/rtp_to_text.cc",
]
sources = [ "tools/rtp_to_text.cc" ]
deps = [
":bwe_rtp",
"../../modules/rtp_rtcp",

8
modules/utility/BUILD.gn
View File

@ -43,9 +43,7 @@ rtc_library("utility") {
rtc_library("mock_process_thread") {
testonly = true
visibility = [ "*" ]
sources = [
"include/mock/mock_process_thread.h",
]
sources = [ "include/mock/mock_process_thread.h" ]
deps = [
":utility",
"../../rtc_base:rtc_base_approved",
@ -57,9 +55,7 @@ if (rtc_include_tests) {
rtc_library("utility_unittests") {
testonly = true
sources = [
"source/process_thread_impl_unittest.cc",
]
sources = [ "source/process_thread_impl_unittest.cc" ]
deps = [
":utility",
"..:module_api",

4
modules/video_capture/BUILD.gn
View File

@ -104,9 +104,7 @@ if (!build_with_chromium) {
if (!is_android && rtc_include_tests) {
rtc_test("video_capture_tests") {
sources = [
"test/video_capture_unittest.cc",
]
sources = [ "test/video_capture_unittest.cc" ]
ldflags = []
if (is_linux || is_mac) {
ldflags += [

16
modules/video_processing/BUILD.gn
View File

@ -51,12 +51,8 @@ rtc_library("video_processing") {
rtc_source_set("denoiser_filter") {
# Target that only exists to avoid cyclic depdency errors for the SSE2 and
# Neon implementations below.
sources = [
"util/denoiser_filter.h",
]
deps = [
"..:module_api",
]
sources = [ "util/denoiser_filter.h" ]
deps = [ "..:module_api" ]
}
if (build_video_processing_sse2) {
@ -85,9 +81,7 @@ if (rtc_build_with_neon) {
"util/denoiser_filter_neon.h",
]
deps = [
":denoiser_filter",
]
deps = [ ":denoiser_filter" ]
if (current_cpu != "arm64") {
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
@ -100,9 +94,7 @@ if (rtc_include_tests) {
rtc_library("video_processing_unittests") {
testonly = true
sources = [
"test/denoiser_test.cc",
]
sources = [ "test/denoiser_test.cc" ]
deps = [
":denoiser_filter",
":video_processing",