GN: Disable Chromium clang plugins for standalone build.
Now that WebRTC has rolled the chromium_revision past http://crrev.com/284372 in r6784, clang has become the default compiler. Since WebRTC standalone code doesn't yet compile the Chromium Clang plugins enabled, this CL disables them for the parts of the code that doesn't yet pass compilation with them enabled. The buildbots are using Goma which is not yet switched over to Clang by default. That's why they're not red yet. BUG=163 TEST=Passing compile locally on Linux using: gn gen out/Debug --args="build_with_chromium=false is_debug=true" && ninja -C out/Debug gn gen out/Release --args="build_with_chromium=false is_debug=false" && ninja -C out/Release gn gen out/Default --args="build_with_chromium=false os=\"android\" cpu_arch=\"arm\" arm_version=7" && ninja -C out/Default R=brettw@chromium.org Review URL: https://webrtc-codereview.appspot.com/16279004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6966 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
b4c7b09c13
commit
42ee5b54b5
@ -213,5 +213,11 @@ source_set("webrtc_common") {
|
||||
"config.cc",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
configs += [ ":common_inherited_config"]
|
||||
}
|
||||
|
@ -424,6 +424,12 @@ static_library("webrtc_base") {
|
||||
deps += [ "//third_party/jsoncpp" ]
|
||||
} # !build_with_chromium
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
# TODO(henrike): issue 3307, make webrtc_base build with the Chromium default
|
||||
# compiler settings.
|
||||
configs -= [ "//build/config/compiler:chromium_code" ]
|
||||
|
@ -34,6 +34,12 @@ source_set("common_video") {
|
||||
|
||||
direct_dependent_configs = [ ":common_video_config" ]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [ "../system_wrappers" ]
|
||||
|
||||
if (build_libyuv) {
|
||||
|
@ -33,6 +33,12 @@ source_set("audio_conference_mixer") {
|
||||
|
||||
direct_dependent_configs = [ ":internal_config" ]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [
|
||||
"../../system_wrappers",
|
||||
"../audio_processing",
|
||||
|
@ -24,5 +24,11 @@ source_set("bitrate_controller") {
|
||||
]
|
||||
}
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [ "../../system_wrappers" ]
|
||||
}
|
||||
|
@ -107,6 +107,12 @@ source_set("desktop_capture") {
|
||||
|
||||
configs += [ "../../:common_inherited_config"]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = ["../../system_wrappers"]
|
||||
|
||||
if (use_desktop_capture_differ_sse2) {
|
||||
|
@ -35,6 +35,12 @@ source_set("media_file") {
|
||||
]
|
||||
}
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
direct_dependent_configs = [ ":internal_config" ]
|
||||
|
||||
deps = [ "../../system_wrappers" ]
|
||||
|
@ -12,5 +12,11 @@ source_set("pacing") {
|
||||
"paced_sender.cc",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [ "../../system_wrappers" ]
|
||||
}
|
||||
|
@ -16,4 +16,10 @@ source_set("remote_bitrate_estimator") {
|
||||
]
|
||||
|
||||
configs += [ "../../:common_inherited_config"]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
}
|
||||
|
@ -93,6 +93,12 @@ source_set("rtp_rtcp") {
|
||||
"source/mock/mock_rtp_payload_strategy.h",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [
|
||||
"../../system_wrappers",
|
||||
"../pacing",
|
||||
|
@ -30,6 +30,12 @@ source_set("utility") {
|
||||
"source/rtp_dump_impl.h",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [
|
||||
"../../common_audio",
|
||||
"../../system_wrappers",
|
||||
|
@ -64,6 +64,12 @@ source_set("video_coding") {
|
||||
"main/source/video_sender.cc",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [
|
||||
":video_coding_utility",
|
||||
":webrtc_i420",
|
||||
@ -79,6 +85,12 @@ source_set("video_coding_utility") {
|
||||
"utility/frame_dropper.cc",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [ "../../system_wrappers" ]
|
||||
}
|
||||
|
||||
@ -88,6 +100,12 @@ source_set("webrtc_i420") {
|
||||
"codecs/i420/main/interface/i420.h",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [ "../../system_wrappers" ]
|
||||
}
|
||||
|
||||
@ -107,6 +125,13 @@ source_set("webrtc_vp8") {
|
||||
# "codecs/vp8/vp8_impl.cc",
|
||||
# "codecs/vp8/vp8_impl.h",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [
|
||||
":video_coding_utility",
|
||||
"../../common_video",
|
||||
|
@ -44,15 +44,25 @@ source_set("video_processing") {
|
||||
if (build_video_processing_sse2) {
|
||||
deps += [ ":video_processing_sse2" ]
|
||||
}
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
}
|
||||
|
||||
if (build_video_processing_sse2) {
|
||||
source_set("video_processing_sse2") {
|
||||
sources = [ "main/source/content_analysis_sse2.cc" ]
|
||||
|
||||
configs += [
|
||||
"../..:common_inherited_config",
|
||||
]
|
||||
configs += [ "../..:common_inherited_config" ]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
if (is_posix) {
|
||||
cflags = [ "-msse2" ]
|
||||
|
@ -108,6 +108,12 @@ static_library("system_wrappers") {
|
||||
|
||||
configs += [ "..:common_config" ]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
direct_dependent_configs = [
|
||||
"..:common_inherited_config",
|
||||
":system_wrappers_inherited_config",
|
||||
@ -195,6 +201,13 @@ source_set("field_trial_default") {
|
||||
sources = [
|
||||
"source/field_trial_default.cc",
|
||||
]
|
||||
|
||||
if (is_clang) {
|
||||
# Suppress warnings from Chrome's Clang plugins.
|
||||
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
||||
configs -= [ "//build/config/clang:find_bad_constructs" ]
|
||||
}
|
||||
|
||||
deps = [
|
||||
":system_wrappers",
|
||||
]
|
||||
|
Loading…
x
Reference in New Issue
Block a user