From 69b34625c1ee2f527e481c420ff1294851463b77 Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 21 Jun 2016 01:05:16 -0700 Subject: [PATCH] Exclude libjingle_peerconnection_{jni,so} targets from Chromium builds. 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} --- webrtc/api/BUILD.gn | 4 +++- webrtc/api/api.gyp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index 442ecbff0c..1dd79bc35c 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -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 diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp index a3113abf21..077a558691 100644 --- a/webrtc/api/api.gyp +++ b/webrtc/api/api.gyp @@ -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',