From 5901d9dfe072e9e4b13459e122b26f6ff327fe78 Mon Sep 17 00:00:00 2001 From: kthelgason Date: Wed, 16 Aug 2017 07:28:03 -0700 Subject: [PATCH] Remove dep on system_wrappers for apprtc and use only framework. This resolves an issue where setting field trials from AppRTCMobile would not affect WebRTC Core as the two are linked with different instances of the field_trials binary. BUG=webrtc:8106 Review-Url: https://codereview.webrtc.org/2997023002 Cr-Commit-Position: refs/heads/master@{#19372} --- webrtc/examples/BUILD.gn | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn index 006485deac..fc01f05bae 100644 --- a/webrtc/examples/BUILD.gn +++ b/webrtc/examples/BUILD.gn @@ -162,14 +162,16 @@ if (is_ios || (is_mac && target_cpu != "x86")) { ] public_configs = [ ":apprtc_common_config" ] - deps = [ - "../system_wrappers:field_trial_default", - "../system_wrappers:metrics_default", - ] if (is_ios) { - deps += [ ":AppRTCMobile_ios_frameworks" ] + deps = [ + ":AppRTCMobile_ios_frameworks", + ] } else { - deps += [ "../sdk:objc_common" ] + deps = [ + "../sdk:objc_common", + "../system_wrappers:field_trial_default", + "../system_wrappers:metrics_default", + ] } }