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

Exclude libjingle_peerconnection_{jni,so} targets from Chromium builds.

Browse Source 
In GN, the libjingle_peerconnection_jni target becomes a part of
'all' implicitly, which surfaced the incompability between it
and the Chromium logging implementation. In the GYP build, the
target is not present due to api.gyp not being depended upon yet.

BUG=webrtc:4256
TBR=perkj@webrtc.org
NOTRY=True

Review-Url: https://codereview.webrtc.org/2082573004
Cr-Commit-Position: refs/heads/master@{#13231}
This commit is contained in:
kjellander 2016-06-21 01:05:16 -07:00 committed by Commit bot
parent 2e82f3821f
commit 69b34625c1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/api/BUILD.gn
View File

@ -127,7 +127,9 @@ source_set("libjingle_peerconnection") {
}
}
if (is_android) {
# Exclude the targets below from the Chromium build since they cannot be built
# due to incompability with Chromium's logging implementation.
if (is_android && !build_with_chromium) {
config("libjingle_peerconnection_jni_warnings_config") {
# The warnings below are enabled by default. Since GN orders compiler flags
# for a target before flags from configs, the only way to disable such

4
webrtc/api/api.gyp
View File

@ -22,7 +22,9 @@
}],
],
}],
['OS=="android"', {
# Excluded from the Chromium build since they cannot be built due to
# incompability with Chromium's logging implementation.
['OS=="android" and build_with_chromium==0', {
'targets': [
{
'target_name': 'libjingle_peerconnection_jni',