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

Testing no /DUNICODE assumptions with Win more configs bots.

Browse Source 
This CL will avoid regressions after the cleanup done in
https://webrtc-review.googlesource.com/c/src/+/128904.

Bug: None
Change-Id: Id01f554a6fb0972139e7810b7523c91321398c0f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130100
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27328}
This commit is contained in:
Mirko Bonadei 2019-03-28 07:50:07 +01:00 committed by Commit Bot
parent 185e802971
commit 20574f48b5
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BUILD.gn
View File

@ -361,6 +361,13 @@ config("common_config") {
# Used in Chromium's overrides to disable logging # Used in Chromium's overrides to disable logging
defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ] defines += [ "WEBRTC_UNSAFE_FUZZER_MODE" ]
} }
if (!build_with_chromium && rtc_win_undef_unicode) {
cflags += [
"/UUNICODE",
"/U_UNICODE",
]
}
} }
config("common_objc") { config("common_objc") {

12
tools_webrtc/mb/mb_config.pyl
View File

@ -99,7 +99,7 @@
'dummy_audio_file_devices_no_protobuf': 'dummy_audio_file_devices_no_protobuf':
'dummy_audio_file_devices_no_protobuf_x86', 'dummy_audio_file_devices_no_protobuf_x86',
'rtti_no_sctp': 'rtti_no_sctp':
'rtti_no_sctp_x86', 'rtti_no_sctp_no_unicode_win_x86',
}, },
}, },
'client.webrtc.perf': { 'client.webrtc.perf': {
@ -241,7 +241,7 @@
'dummy_audio_file_devices_no_protobuf': 'dummy_audio_file_devices_no_protobuf':
'dummy_audio_file_devices_no_protobuf_x86', 'dummy_audio_file_devices_no_protobuf_x86',
'rtti_no_sctp': 'rtti_no_sctp':
'rtti_no_sctp_x86', 'rtti_no_sctp_no_unicode_win_x86',
}, },
} }
}, },
@ -432,8 +432,8 @@
'dummy_audio_file_devices_no_protobuf_x86': [ 'dummy_audio_file_devices_no_protobuf_x86': [
'debug_bot', 'x86', 'dummy_audio_file_devices', 'no_protobuf' 'debug_bot', 'x86', 'dummy_audio_file_devices', 'no_protobuf'
], ],
'rtti_no_sctp_x86': [ 'rtti_no_sctp_no_unicode_win_x86': [
'debug_bot', 'x86', 'rtti', 'no_sctp' 'debug_bot', 'x86', 'rtti', 'no_sctp', 'win_undef_unicode'
], ],
'bwe_test_logging_android_arm': [ 'bwe_test_logging_android_arm': [
@ -627,5 +627,9 @@
'winuwp': { 'winuwp': {
'gn_args': 'target_os="winuwp"', 'gn_args': 'target_os="winuwp"',
}, },
'win_undef_unicode': {
'gn_args': 'rtc_win_undef_unicode=true',
},
}, },
} }

8
webrtc.gni
View File

@ -187,6 +187,14 @@ declare_args() {
# (they will still be included in libjingle_peerconnection_so.so and # (they will still be included in libjingle_peerconnection_so.so and
# WebRTC.framework) # WebRTC.framework)
rtc_include_builtin_video_codecs = true rtc_include_builtin_video_codecs = true
# When set to true and in a standalone build, it will undefine UNICODE and
# _UNICODE (which are always defined globally by the Chromium Windows
# toolchain).
# This is only needed for testing purposes, WebRTC wants to be sure it
# doesn't assume /DUNICODE and /D_UNICODE but that it explicitly uses
# wide character functions.
rtc_win_undef_unicode = false
} }
if (!build_with_mozilla) { if (!build_with_mozilla) {