Re-enabling 'gn check' on //examples/*.
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:
parent
820941a1fd
commit
cbaaaed418
4
.gn
4
.gn
@ -28,9 +28,7 @@ check_targets = [
|
|||||||
"//call/*",
|
"//call/*",
|
||||||
"//common_audio/*",
|
"//common_audio/*",
|
||||||
"//common_video/*",
|
"//common_video/*",
|
||||||
|
"//examples/*",
|
||||||
# TODO(bugs.webrtc.org/8850): re-enable when 'gn check' will be fixed.
|
|
||||||
# "//examples/*",
|
|
||||||
"//logging/*",
|
"//logging/*",
|
||||||
"//media/*",
|
"//media/*",
|
||||||
"//modules/*",
|
"//modules/*",
|
||||||
|
|||||||
@ -178,6 +178,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
|
|||||||
public_configs = [ ":apprtc_common_config" ]
|
public_configs = [ ":apprtc_common_config" ]
|
||||||
|
|
||||||
if (is_ios) {
|
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 = [
|
deps = [
|
||||||
"../sdk:framework_objc",
|
"../sdk:framework_objc",
|
||||||
"../system_wrappers:field_trial_default",
|
"../system_wrappers:field_trial_default",
|
||||||
@ -254,18 +258,32 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
|
|||||||
":socketrocket",
|
":socketrocket",
|
||||||
]
|
]
|
||||||
if (is_ios) {
|
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 += [
|
deps += [
|
||||||
":AppRTCMobile_ios_frameworks",
|
":AppRTCMobile_ios_frameworks",
|
||||||
"../sdk:framework_objc",
|
"../sdk:framework_objc",
|
||||||
]
|
]
|
||||||
} else {
|
} 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" ]
|
libs = [ "QuartzCore.framework" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_ios) {
|
if (is_ios) {
|
||||||
rtc_static_library("AppRTCMobile_lib") {
|
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
|
testonly = true
|
||||||
sources = [
|
sources = [
|
||||||
"objc/AppRTCMobile/ios/ARDAppDelegate.h",
|
"objc/AppRTCMobile/ios/ARDAppDelegate.h",
|
||||||
@ -378,7 +396,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
|
|||||||
":apprtc_signaling",
|
":apprtc_signaling",
|
||||||
"../sdk:default_codec_factory_objc",
|
"../sdk:default_codec_factory_objc",
|
||||||
"../sdk:metal_objc",
|
"../sdk:metal_objc",
|
||||||
|
"../sdk:peerconnectionfactory_base_objc",
|
||||||
"../sdk:ui_objc",
|
"../sdk:ui_objc",
|
||||||
|
"../sdk:videocapture_objc",
|
||||||
|
"../sdk:videocodec_objc",
|
||||||
"../sdk:videocodec_objc",
|
"../sdk:videocodec_objc",
|
||||||
"../sdk:videotoolbox_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.
|
# TODO(kthelgason): compile xctests on mac when chromium supports it.
|
||||||
if (is_ios) {
|
if (is_ios) {
|
||||||
rtc_source_set("apprtcmobile_test_sources") {
|
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
|
testonly = true
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"objc/AppRTCMobile",
|
"objc/AppRTCMobile",
|
||||||
@ -458,6 +483,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
|
|||||||
deps = [
|
deps = [
|
||||||
":AppRTCMobile_ios_frameworks",
|
":AppRTCMobile_ios_frameworks",
|
||||||
":AppRTCMobile_lib",
|
":AppRTCMobile_lib",
|
||||||
|
":apprtc_signaling",
|
||||||
"../rtc_base:rtc_base",
|
"../rtc_base:rtc_base",
|
||||||
"../sdk:framework_objc",
|
"../sdk:framework_objc",
|
||||||
"//build/config/ios:xctest",
|
"//build/config/ios:xctest",
|
||||||
@ -471,6 +497,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
|
|||||||
"objc/AppRTCMobile/ios/main.m",
|
"objc/AppRTCMobile/ios/main.m",
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [
|
||||||
|
":AppRTCMobile_lib",
|
||||||
":apprtcmobile_test_sources",
|
":apprtcmobile_test_sources",
|
||||||
"../sdk:framework_objc",
|
"../sdk:framework_objc",
|
||||||
]
|
]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user