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

Re-enabling 'gn check' on //examples/*.

Browse Source 
Bug: webrtc:8850
Change-Id: I7397bc17e0f790a31d417d1bf5db6c5f9e32088d
No-Presubmit: true
Reviewed-on: https://webrtc-review.googlesource.com/54314
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22085}
This commit is contained in:
Mirko Bonadei 2018-02-19 15:14:04 +01:00 committed by Commit Bot
parent 820941a1fd
commit cbaaaed418
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gn
View File

@ -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/*",

29
examples/BUILD.gn
View File

@ -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",
]