diff --git a/.gn b/.gn index 5937b34a12..9d95808b82 100644 --- a/.gn +++ b/.gn @@ -28,9 +28,7 @@ check_targets = [ "//call/*", "//common_audio/*", "//common_video/*", - - # TODO(bugs.webrtc.org/8850): re-enable when 'gn check' will be fixed. - # "//examples/*", + "//examples/*", "//logging/*", "//media/*", "//modules/*", diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 7067842be8..2bc3f846a3 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -178,6 +178,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) { public_configs = [ ":apprtc_common_config" ] if (is_ios) { + # iOS must use WebRTC.framework which is dynamically linked. + # 'gn check' is disabled in order to avoid confusion and + # errors caused by multiple implementations. + check_includes = false deps = [ "../sdk:framework_objc", "../system_wrappers:field_trial_default", @@ -254,18 +258,32 @@ if (is_ios || (is_mac && target_cpu != "x86")) { ":socketrocket", ] if (is_ios) { + # iOS must use WebRTC.framework which is dynamically linked. + # 'gn check' is disabled in order to avoid confusion and + # errors caused by multiple implementations. + check_includes = false deps += [ ":AppRTCMobile_ios_frameworks", "../sdk:framework_objc", ] } else { - deps += [ "../sdk:peerconnectionfactory_base_objc" ] + deps += [ + "../sdk:common_objc", + "../sdk:mediaconstraints_objc", + "../sdk:peerconnectionfactory_base_objc", + "../sdk:videocapture_objc", + "../sdk:videocodec_objc", + ] } libs = [ "QuartzCore.framework" ] } if (is_ios) { rtc_static_library("AppRTCMobile_lib") { + # iOS must use WebRTC.framework which is dynamically linked. + # 'gn check' is disabled in order to avoid confusion and + # errors caused by multiple implementations. + check_includes = false testonly = true sources = [ "objc/AppRTCMobile/ios/ARDAppDelegate.h", @@ -378,7 +396,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) { ":apprtc_signaling", "../sdk:default_codec_factory_objc", "../sdk:metal_objc", + "../sdk:peerconnectionfactory_base_objc", "../sdk:ui_objc", + "../sdk:videocapture_objc", + "../sdk:videocodec_objc", "../sdk:videocodec_objc", "../sdk:videotoolbox_objc", ] @@ -444,6 +465,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) { # TODO(kthelgason): compile xctests on mac when chromium supports it. if (is_ios) { rtc_source_set("apprtcmobile_test_sources") { + # iOS must use WebRTC.framework which is dynamically linked. + # 'gn check' is disabled in order to avoid confusion and + # errors caused by multiple implementations. + check_includes = false testonly = true include_dirs = [ "objc/AppRTCMobile", @@ -458,6 +483,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { deps = [ ":AppRTCMobile_ios_frameworks", ":AppRTCMobile_lib", + ":apprtc_signaling", "../rtc_base:rtc_base", "../sdk:framework_objc", "//build/config/ios:xctest", @@ -471,6 +497,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "objc/AppRTCMobile/ios/main.m", ] deps = [ + ":AppRTCMobile_lib", ":apprtcmobile_test_sources", "../sdk:framework_objc", ]