admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of GN: Include webrtc/api targets even if rtc_include_tests=false (patchset #2 id:20001 of https://codereview.webrtc.org/2725053008/ )

Browse Source 
Reason for revert:
Fails Chromium builds:
b/c/b/linux/src/buildtools/linux64/gn gen //out/Release --check
  -> returned 1
ERROR at //third_party/webrtc/api/BUILD.gn:186:5: Can't load input file.
    "//webrtc/test:test_support",
    ^-------------------------

Original issue's description:
> GN: Include webrtc/api targets even if rtc_include_tests=false
>
> The main purpose with the rtc_include_tests GN variable is to avoid
> generating and compiling all the test targets.
> Some of our examples have dependencies on the test headers in API,
> so therefore this change is relaxing that condition.
>
> BUG=webrtc:6828
> NOTRY=True
> TBR=ehmaldonado@webrtc.org,
>
> Review-Url: https://codereview.webrtc.org/2725053008
> Cr-Commit-Position: refs/heads/master@{#16989}
> Committed: a769ceba65

TBR=ehmaldonado@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6828

Review-Url: https://codereview.webrtc.org/2728073002
Cr-Commit-Position: refs/heads/master@{#16990}
This commit is contained in:
kjellander 2017-03-02 22:26:23 -08:00 committed by Commit bot
parent a769ceba65
commit 2f6af9ca7a
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
webrtc/api/BUILD.gn
View File

@ -171,55 +171,55 @@ rtc_source_set("video_frame_api") {
}
}
rtc_source_set("mock_audio_mixer") {
testonly = true
sources = [
"test/mock_audio_mixer.h",
]
public_deps = [
":audio_mixer_api",
]
deps = [
"//testing/gmock",
"//webrtc/test:test_support",
]
}
rtc_source_set("libjingle_peerconnection_test_api") {
testonly = true
sources = [
"test/fakeconstraints.h",
]
public_deps = [
":libjingle_peerconnection_api",
]
deps = [
"../base:rtc_base_approved",
"//webrtc/test:test_support",
]
}
rtc_source_set("fakemetricsobserver") {
testonly = true
sources = [
"fakemetricsobserver.cc",
"fakemetricsobserver.h",
]
deps = [
":libjingle_peerconnection_api",
"../base:rtc_base_approved",
]
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" ]
}
}
if (rtc_include_tests) {
rtc_source_set("mock_audio_mixer") {
testonly = true
sources = [
"test/mock_audio_mixer.h",
]
public_deps = [
":audio_mixer_api",
]
deps = [
"//testing/gmock",
"//webrtc/test:test_support",
]
}
rtc_source_set("libjingle_peerconnection_test_api") {
testonly = true
sources = [
"test/fakeconstraints.h",
]
public_deps = [
":libjingle_peerconnection_api",
]
deps = [
"../base:rtc_base_approved",
"//webrtc/test:test_support",
]
}
rtc_source_set("fakemetricsobserver") {
testonly = true
sources = [
"fakemetricsobserver.cc",
"fakemetricsobserver.h",
]
deps = [
":libjingle_peerconnection_api",
"../base:rtc_base_approved",
]
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" ]
}
}
rtc_source_set("rtc_api_unittests") {
testonly = true
sources = [