generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GN: Fix build by disabling compiler warning in base.

Browse Source 
It seems like it is not possible to disabled the -Wall
warnings that are enabled in build/config/compiler/BUILD.gn
with -Wno-all.

According to the documentation at
https://code.google.com/p/chromium/wiki/GNCookbook
the proper way is to disable the chromium_code config instead.

System wrappers also needed some minor fixes for Android.

TBR=henrike@webrtc.org
BUG=3441
TEST=Passing our GN trybots.

Review URL: https://webrtc-codereview.appspot.com/18649004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6561 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-06-29 13:37:08 +00:00
parent 7497fa74e4
commit 62711f8227
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/base/BUILD.gn
View File

@ -435,12 +435,11 @@ static_library("webrtc_base") {
deps += [ "//third_party/jsoncpp" ] deps += [ "//third_party/jsoncpp" ]
} # !build_with_chromium } # !build_with_chromium
# TODO(henrike): issue 3307, make webrtc_base build without disabling # TODO(henrike): issue 3307, make webrtc_base build with the Chromium default
# these flags. # compiler settings.
cflags += [ configs -= [ "//build/config/compiler:chromium_code" ]
"-Wno-extra", configs += [ "//build/config/compiler:no_chromium_code" ]
"-Wno-all", cflags += [ "-Wno-uninitialized" ]
]
cflags_cc += [ "-Wno-non-virtual-dtor" ] cflags_cc += [ "-Wno-non-virtual-dtor" ]
if (use_openssl) { if (use_openssl) {

6
webrtc/system_wrappers/BUILD.gn
View File

@ -6,6 +6,7 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("//build/config/android/config.gni")
import("../build/webrtc.gni") import("../build/webrtc.gni")
config("system_wrappers_inherited_config") { config("system_wrappers_inherited_config") {
@ -120,6 +121,7 @@ static_library("system_wrappers") {
defines = [] defines = []
libs = [] libs = []
deps = []
if (is_android) { if (is_android) {
sources += [ sources += [
@ -136,7 +138,7 @@ static_library("system_wrappers") {
"WEBRTC_CLOCK_TYPE_REALTIME", "WEBRTC_CLOCK_TYPE_REALTIME",
] ]
deps = [ "cpu_features_android" ] deps += [ ":cpu_features_android" ]
libs += [ "log" ] libs += [ "log" ]
} }
@ -184,7 +186,7 @@ static_library("system_wrappers") {
"source/spreadsortlib", "source/spreadsortlib",
] ]
deps = [ deps += [
"../base:webrtc_base", "../base:webrtc_base",
] ]
} }