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

Reland of Enable GN check for webrtc/base (patchset #3 id:230001 of https://codereview.webrtc.org/2838683002/ )

Browse Source 
Reason for revert:
Try to fix the webrtc/test/fuzzers issue and reland this CL because it
contains lots of fixes for our BUILD.gn files.

Original issue's description:
> Revert of Enable GN check for webrtc/base (patchset #13 id:240001 of https://codereview.webrtc.org/2717083002/ )
>
> Reason for revert:
> Breaks Chromium because in Chromium we import WebRTC with rtc_include_tests=false (https://bugs.chromium.org/p/chromium/issues/detail?id=713179#c6).
>
> Chromium uses webrtc/test/fuzzers and this CL adds test dependencies to neteq_rtc_fuzzer.
>
> Original issue's description:
> > Enable GN check for webrtc/base
> >
> > It's not possible to enable it for the rtc_base_approved
> > target but since a larger refactoring is ongoing for webrtc/base
> > this CL doesn't attempt to fix that.
> >
> > Changes made:
> > * Move webrtc/system_wrappers/include/stringize_macros.h into
> >   webrtc/base:rtc_base_approved_unittests (and corresponding
> >   unit test to rtc_base_approved_unittests).
> > * Move md5digest.* from rtc_base_approved to rtc_base_test_utils target.
> > * Move webrtc/system_wrappers/include/stringize_macros.h (+test) into
> >   webrtc/base.
> > * Remove unused use include of webrtc/base/fileutils.h in
> >   webrtc/base/pathutils.cc
> >
> > BUG=webrtc:6828, webrtc:3806, webrtc:7480
> > NOTRY=True
> >
> > Review-Url: https://codereview.webrtc.org/2717083002
> > Cr-Commit-Position: refs/heads/master@{#17766}
> > Committed: ed754e71ae
>
> TBR=perkj@webrtc.org,tommi@webrtc.org,nisse@webrtc.org,kjellander@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:6828, webrtc:3806, webrtc:7480
> NOTRY=True
>
> Review-Url: https://codereview.webrtc.org/2838683002
> Cr-Commit-Position: refs/heads/master@{#17849}
> Committed: 11ed366c48

TBR=perkj@webrtc.org,tommi@webrtc.org,nisse@webrtc.org,kjellander@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6828, webrtc:3806, webrtc:7480

Review-Url: https://codereview.webrtc.org/2840453004
Cr-Commit-Position: refs/heads/master@{#17876}
This commit is contained in:
mbonadei
2017-04-26 00:28:08 -07:00
committed by Commit bot
parent dbb1be59ff
commit 7054085e59
11 changed files with 194 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
webrtc/modules/audio_coding/BUILD.gn
View File

@ -1130,6 +1130,101 @@ rtc_source_set("neteq_test_minimal") {
]
}
config("neteq_unittest_tools_config") {
include_dirs = [ "tools" ]
}
rtc_source_set("neteq_unittest_tools") {
testonly = true
sources = [
"neteq/tools/audio_checksum.h",
"neteq/tools/audio_loop.cc",
"neteq/tools/audio_loop.h",
"neteq/tools/audio_sink.cc",
"neteq/tools/audio_sink.h",
"neteq/tools/constant_pcm_packet_source.cc",
"neteq/tools/constant_pcm_packet_source.h",
"neteq/tools/fake_decode_from_file.cc",
"neteq/tools/fake_decode_from_file.h",
"neteq/tools/input_audio_file.cc",
"neteq/tools/input_audio_file.h",
"neteq/tools/neteq_input.h",
"neteq/tools/neteq_replacement_input.cc",
"neteq/tools/neteq_replacement_input.h",
"neteq/tools/output_audio_file.h",
"neteq/tools/output_wav_file.h",
"neteq/tools/packet.cc",
"neteq/tools/packet.h",
"neteq/tools/packet_source.cc",
"neteq/tools/packet_source.h",
"neteq/tools/resample_input_audio_file.cc",
"neteq/tools/resample_input_audio_file.h",
"neteq/tools/rtp_file_source.cc",
"neteq/tools/rtp_file_source.h",
"neteq/tools/rtp_generator.cc",
"neteq/tools/rtp_generator.h",
]
public_configs = [ ":neteq_unittest_tools_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
":audio_encoder_interface",
":pcm16b",
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../base:rtc_base_approved",
"../../base:rtc_base_tests_utils",
"../../common_audio",
"../../test:rtp_test_utils",
"../rtp_rtcp",
]
public_deps = [
":neteq_test_minimal",
]
if (rtc_enable_protobuf) {
sources += [
"neteq/tools/neteq_packet_source_input.cc",
"neteq/tools/neteq_packet_source_input.h",
]
deps += [ ":rtc_event_log_source" ]
}
}
if (rtc_enable_protobuf) {
rtc_static_library("rtc_event_log_source") {
testonly = true
# TODO(kjellander): Remove (bugs.webrtc.org/6828)
# Needs call.h to be moved to webrtc/api first.
check_includes = false
sources = [
"neteq/tools/rtc_event_log_source.cc",
"neteq/tools/rtc_event_log_source.h",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
"../../base:rtc_base_approved",
"../../logging:rtc_event_log_parser",
]
public_deps = [
"../../logging:rtc_event_log_proto",
]
}
}
if (rtc_include_tests) {
group("audio_coding_tests") {
testonly = true
@ -1400,32 +1495,6 @@ if (rtc_include_tests) {
proto_out_dir = "webrtc/modules/audio_coding/neteq"
}
rtc_static_library("rtc_event_log_source") {
testonly = true
# TODO(kjellander): Remove (bugs.webrtc.org/6828)
# Needs call.h to be moved to webrtc/api first.
check_includes = false
sources = [
"neteq/tools/rtc_event_log_source.cc",
"neteq/tools/rtc_event_log_source.h",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
"../../base:rtc_base_approved",
"../../logging:rtc_event_log_parser",
]
public_deps = [
"../../logging:rtc_event_log_proto",
]
}
rtc_test("neteq_rtpplay") {
testonly = true
defines = []
@ -1543,72 +1612,6 @@ if (rtc_include_tests) {
]
}
config("neteq_unittest_tools_config") {
include_dirs = [ "tools" ]
}
rtc_source_set("neteq_unittest_tools") {
testonly = true
sources = [
"neteq/tools/audio_checksum.h",
"neteq/tools/audio_loop.cc",
"neteq/tools/audio_loop.h",
"neteq/tools/audio_sink.cc",
"neteq/tools/audio_sink.h",
"neteq/tools/constant_pcm_packet_source.cc",
"neteq/tools/constant_pcm_packet_source.h",
"neteq/tools/fake_decode_from_file.cc",
"neteq/tools/fake_decode_from_file.h",
"neteq/tools/input_audio_file.cc",
"neteq/tools/input_audio_file.h",
"neteq/tools/neteq_input.h",
"neteq/tools/neteq_replacement_input.cc",
"neteq/tools/neteq_replacement_input.h",
"neteq/tools/output_audio_file.h",
"neteq/tools/output_wav_file.h",
"neteq/tools/packet.cc",
"neteq/tools/packet.h",
"neteq/tools/packet_source.cc",
"neteq/tools/packet_source.h",
"neteq/tools/resample_input_audio_file.cc",
"neteq/tools/resample_input_audio_file.h",
"neteq/tools/rtp_file_source.cc",
"neteq/tools/rtp_file_source.h",
"neteq/tools/rtp_generator.cc",
"neteq/tools/rtp_generator.h",
]
public_configs = [ ":neteq_unittest_tools_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
deps = [
":audio_encoder_interface",
":pcm16b",
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../base:rtc_base_approved",
"../../common_audio",
"../../test:rtp_test_utils",
"../rtp_rtcp",
]
public_deps = [
":neteq_test_minimal",
]
if (rtc_enable_protobuf) {
sources += [
"neteq/tools/neteq_packet_source_input.cc",
"neteq/tools/neteq_packet_source_input.h",
]
deps += [ ":rtc_event_log_source" ]
}
}
rtc_source_set("neteq_test_tools") {
testonly = true
sources = [