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

Fix the RTC+Chromium GN build.

Browse Source 
LOGGING_INSIDE_WEBRTC was being set in the inherited config, whereas in the GYP build this define is not inherited. This caused duplicate logging macros to be defined in Chrome files dependening on WebRTC targets.

Move LOGGING_INSIDE_WEBRTC to the common config (non-inherited).

TBR=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7122 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
brettw@chromium.org 2014-09-09 19:15:33 +00:00
parent 54cf1505e2
commit 9fe11010f7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/BUILD.gn
View File

@ -23,7 +23,6 @@ config("common_inherited_config") {
if (build_with_chromium) {
defines = [
"WEBRTC_CHROMIUM_BUILD",
"LOGGING_INSIDE_WEBRTC",
]
include_dirs = [
# overrides must be included first as that is the mechanism for
@ -89,7 +88,9 @@ config("common_config") {
defines += [ "WEBRTC_MODULE_UTILITY_VIDEO" ]
}
if (!build_with_chromium) {
if (build_with_chromium) {
defines += [ "LOGGING_INSIDE_WEBRTC" ]
} else {
if (is_posix) {
# -Wextra is currently disabled in Chromium"s common.gypi. Enable
# for targets that can handle it. For Android/arm64 right now