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

Rename all objc targets to be suffixed for consistency

Browse Source 
BUG=webrtc:6412

Review-Url: https://codereview.webrtc.org/3001023003
Cr-Commit-Position: refs/heads/master@{#19489}
This commit is contained in:
kthelgason 2017-08-24 05:43:45 -07:00 committed by Commit Bot
parent 955d7f19e8
commit 36d658d085
6 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/BUILD.gn
View File

@ -423,7 +423,7 @@ if (rtc_include_tests) {
}
if (is_ios || is_mac) {
deps += [ "sdk:objc_sdk_unittests" ]
deps += [ "sdk:sdk_unittests_objc" ]
}
}

8
webrtc/examples/BUILD.gn
View File

@ -168,7 +168,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
]
} else {
deps = [
"../sdk:objc_common",
"../sdk:common_objc",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
]
@ -241,7 +241,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
deps += [ ":AppRTCMobile_ios_frameworks" ]
} else {
public_deps = [
"../sdk:objc_peerconnection",
"../sdk:peerconnection_objc",
]
}
libs = [ "QuartzCore.framework" ]
@ -300,7 +300,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
bundle_data("AppRTCMobile_ios_frameworks") {
public_deps = [
"../sdk:objc_framework+link",
"../sdk:framework_objc+link",
]
sources = [
"$root_out_dir/WebRTC.framework",
@ -350,7 +350,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
deps = [
":apprtc_common",
":apprtc_signaling",
"../sdk:objc_ui",
"../sdk:ui_objc",
]
}

4
webrtc/modules/audio_device/BUILD.gn
View File

@ -179,8 +179,8 @@ rtc_static_library("audio_device") {
public_deps = [
"../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base",
"../../sdk:objc_audio",
"../../sdk:objc_common",
"../../sdk:audio_objc",
"../../sdk:common_objc",
]
sources += [
"ios/audio_device_ios.h",

20
webrtc/modules/video_coding/BUILD.gn
View File

@ -279,7 +279,7 @@ rtc_static_library("webrtc_vp9") {
if (rtc_include_tests) {
if (is_ios || is_mac) {
rtc_static_library("objc_codec_test") {
rtc_static_library("codec_test_objc") {
sources = [
"codecs/test/objc_codec_h264_test.h",
"codecs/test/objc_codec_h264_test.mm",
@ -289,11 +289,11 @@ if (rtc_include_tests) {
"../../api/video_codecs:video_codecs_api",
"../../media:rtc_audio_video",
"../../modules:module_api",
"../../sdk:objc_common",
"../../sdk:objc_peerconnection",
"../../sdk:objc_peerconnectionfactory",
"../../sdk:objc_videotoolbox",
"../../sdk:objc_videotracksource",
"../../sdk:common_objc",
"../../sdk:peerconnection_objc",
"../../sdk:peerconnectionfactory_objc",
"../../sdk:videotoolbox_objc",
"../../sdk:videotracksource_objc",
]
if (!build_with_chromium && is_clang) {
@ -428,9 +428,9 @@ if (rtc_include_tests) {
if (is_ios || is_mac) {
deps += [
":objc_codec_test",
":codec_test_objc",
"../../media:rtc_media_base",
"../../sdk:objc_videotoolbox",
"../../sdk:videotoolbox_objc",
]
}
}
@ -467,7 +467,7 @@ if (rtc_include_tests) {
]
if (is_ios || is_mac) {
deps += [ ":objc_codec_test" ]
deps += [ ":codec_test_objc" ]
}
if (rtc_use_h264) {
@ -535,7 +535,7 @@ if (rtc_include_tests) {
if (is_ios || is_mac) {
deps += [
":objc_codec_test",
":codec_test_objc",
":plot_videoprocessor_integrationtest_bundle_data",
]
}

114
webrtc/sdk/BUILD.gn
View File

@ -24,13 +24,13 @@ group("sdk") {
public_deps += [ "android" ]
}
if (is_ios) {
public_deps += [ ":objc_framework" ]
public_deps += [ ":framework_objc" ]
}
}
}
if (is_ios || is_mac) {
config("objc_common_config") {
config("common_config_objc") {
include_dirs = [
"objc/Framework/Classes",
"objc/Framework/Classes/Audio",
@ -44,7 +44,7 @@ if (is_ios || is_mac) {
]
}
rtc_static_library("objc_common") {
rtc_static_library("common_objc") {
sources = [
"objc/Framework/Classes/Common/NSString+StdString.h",
"objc/Framework/Classes/Common/NSString+StdString.mm",
@ -67,7 +67,7 @@ if (is_ios || is_mac) {
]
configs += [ "..:common_objc" ]
public_configs = [ ":objc_common_config" ]
public_configs = [ ":common_config_objc" ]
if (is_ios) {
sources += [
@ -85,7 +85,7 @@ if (is_ios || is_mac) {
}
if (!build_with_chromium) {
rtc_static_library("objc_audio") {
rtc_static_library("audio_objc") {
sources = [
"objc/Framework/Classes/Audio/RTCAudioSession+Configuration.mm",
"objc/Framework/Classes/Audio/RTCAudioSession+Private.h",
@ -97,7 +97,7 @@ if (is_ios || is_mac) {
configs += [ "..:common_objc" ]
deps = [
":objc_common",
":common_objc",
"../rtc_base:rtc_base_approved",
]
@ -111,7 +111,7 @@ if (is_ios || is_mac) {
# Keep videotracksource related code in a separate target so that we can
# build PeerConnectionFactory without audio/video support when that's called
# for.
rtc_static_library("objc_videotracksource") {
rtc_static_library("videotracksource_objc") {
sources = [
"objc/Framework/Classes/Video/RTCCVPixelBuffer.mm",
"objc/Framework/Classes/Video/RTCI420Buffer+Private.h",
@ -124,7 +124,7 @@ if (is_ios || is_mac) {
]
deps = [
":objc_common",
":common_objc",
"../api:libjingle_peerconnection_api",
"../api:video_frame_api",
"../common_video",
@ -140,7 +140,7 @@ if (is_ios || is_mac) {
}
}
rtc_static_library("objc_video") {
rtc_static_library("video_objc") {
sources = [
"objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.h",
"objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.mm",
@ -180,8 +180,8 @@ if (is_ios || is_mac) {
}
deps = [
":objc_common",
":objc_videotracksource",
":common_objc",
":videotracksource_objc",
"../api:libjingle_peerconnection_api",
"../common_video",
"../media:rtc_media_base",
@ -196,7 +196,7 @@ if (is_ios || is_mac) {
}
}
rtc_static_library("objc_ui") {
rtc_static_library("ui_objc") {
if (is_ios) {
sources = [
"objc/Framework/Classes/UI/RTCCameraPreviewView.m",
@ -213,13 +213,13 @@ if (is_ios || is_mac) {
}
configs += [ "..:common_objc" ]
deps = [
":objc_common",
":objc_peerconnection",
":common_objc",
":peerconnection_objc",
]
}
if (rtc_use_metal_rendering) {
rtc_static_library("objc_metal") {
rtc_static_library("metal_objc") {
sources = [
"objc/Framework/Classes/Metal/RTCMTLI420Renderer.h",
"objc/Framework/Classes/Metal/RTCMTLI420Renderer.mm",
@ -247,16 +247,16 @@ if (is_ios || is_mac) {
"MetalKit.framework",
]
deps = [
":objc_video",
":video_objc",
"../api:video_frame_api",
"../rtc_base:rtc_base_approved",
]
configs += [ "..:common_objc" ]
public_configs = [ ":objc_common_config" ]
public_configs = [ ":common_config_objc" ]
}
}
rtc_static_library("objc_peerconnection") {
rtc_static_library("peerconnection_objc") {
sources = [
"objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource+Private.h",
"objc/Framework/Classes/PeerConnection/RTCAVFoundationVideoSource.mm",
@ -277,7 +277,7 @@ if (is_ios || is_mac) {
configs += [ "..:common_objc" ]
public_configs = [ ":objc_common_config" ]
public_configs = [ ":common_config_objc" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin
@ -286,10 +286,10 @@ if (is_ios || is_mac) {
}
deps = [
":objc_common",
":objc_corevideoframebuffer",
":objc_peerconnectionfactory",
":objc_video",
":common_objc",
":corevideoframebuffer_objc",
":peerconnectionfactory_objc",
":video_objc",
"../api:video_frame_api",
"../media:rtc_media_base",
"../pc:libjingle_peerconnection",
@ -297,7 +297,7 @@ if (is_ios || is_mac) {
]
if (rtc_use_metal_rendering) {
deps += [ ":objc_metal" ]
deps += [ ":metal_objc" ]
}
if (rtc_build_libyuv) {
@ -308,7 +308,7 @@ if (is_ios || is_mac) {
}
}
rtc_static_library("objc_peerconnectionfactory") {
rtc_static_library("peerconnectionfactory_objc") {
sources = [
"objc/Framework/Classes/PeerConnection/RTCBuiltinAudioDecoderFactory.mm",
"objc/Framework/Classes/PeerConnection/RTCBuiltinAudioEncoderFactory.mm",
@ -321,7 +321,7 @@ if (is_ios || is_mac) {
"objc/Framework/Headers/WebRTC/RTCBuiltinAudioEncoderFactory.h",
]
public_configs = [ ":objc_common_config" ]
public_configs = [ ":common_config_objc" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin
@ -330,12 +330,12 @@ if (is_ios || is_mac) {
}
deps = [
":objc_common",
":objc_corevideoframebuffer",
":objc_peerconnectionfactory_base",
":objc_video",
":objc_videotoolbox",
":objc_videotracksource",
":common_objc",
":corevideoframebuffer_objc",
":peerconnectionfactory_base_objc",
":video_objc",
":videotoolbox_objc",
":videotracksource_objc",
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
@ -357,7 +357,7 @@ if (is_ios || is_mac) {
# webrtc::PeerConnectionInterface.
# The applications which only use WebRTC DataChannel can depend on this
# target instead of rtc_sdk_objc.
rtc_static_library("objc_peerconnectionfactory_no_media") {
rtc_static_library("peerconnectionfactory_no_media_objc") {
defines = [ "HAVE_NO_MEDIA" ]
sources = [
@ -365,7 +365,7 @@ if (is_ios || is_mac) {
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm",
]
public_configs = [ ":objc_common_config" ]
public_configs = [ ":common_config_objc" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin
@ -374,13 +374,13 @@ if (is_ios || is_mac) {
}
deps = [
":objc_peerconnectionfactory_base",
":peerconnectionfactory_base_objc",
"../api:libjingle_peerconnection_api",
"../rtc_base:rtc_base",
]
}
rtc_static_library("objc_peerconnectionfactory_base") {
rtc_static_library("peerconnectionfactory_base_objc") {
sources = [
"objc/Framework/Classes/PeerConnection/RTCAudioSource+Private.h",
"objc/Framework/Classes/PeerConnection/RTCAudioSource.mm",
@ -480,7 +480,7 @@ if (is_ios || is_mac) {
configs += [ "..:common_objc" ]
public_configs = [ ":objc_common_config" ]
public_configs = [ ":common_config_objc" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin
@ -489,9 +489,9 @@ if (is_ios || is_mac) {
}
deps = [
":objc_common",
":objc_corevideoframebuffer",
":objc_videotracksource",
":common_objc",
":corevideoframebuffer_objc",
":videotracksource_objc",
"../api:video_frame_api",
"../common_video",
"../media:rtc_media_base",
@ -502,7 +502,7 @@ if (is_ios || is_mac) {
}
if (rtc_include_tests) {
rtc_source_set("objc_sdk_unittests") {
rtc_source_set("sdk_unittests_objc") {
testonly = true
# Skip restricting visibility on mobile platforms since the tests on those
@ -540,10 +540,10 @@ if (is_ios || is_mac) {
defines = [ "GTEST_RELATIVE_PATH" ]
deps = [
":objc_peerconnection",
":objc_peerconnectionfactory",
":objc_videotoolbox",
":objc_videotracksource",
":peerconnection_objc",
":peerconnectionfactory_objc",
":videotoolbox_objc",
":videotracksource_objc",
"..//system_wrappers:system_wrappers_default",
"../modules:module_api",
"../rtc_base:rtc_base_tests_utils",
@ -574,7 +574,7 @@ if (is_ios || is_mac) {
}
if (is_ios) {
ios_framework_bundle("objc_framework") {
ios_framework_bundle("framework_objc") {
info_plist = "objc/Framework/Info.plist"
output_name = "WebRTC"
common_objc_headers = [
@ -649,9 +649,9 @@ if (is_ios || is_mac) {
]
deps = [
":objc_audio",
":objc_peerconnection",
":objc_ui",
":audio_objc",
":peerconnection_objc",
":ui_objc",
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
@ -666,7 +666,7 @@ if (is_ios || is_mac) {
configs += [ "..:common_objc" ]
public_configs = [ ":objc_common_config" ]
public_configs = [ ":common_config_objc" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin
@ -679,14 +679,14 @@ if (is_ios || is_mac) {
rtc_static_library("rtc_sdk_objc") {
complete_static_lib = true
deps = [
":objc_peerconnection",
":objc_ui",
":peerconnection_objc",
":ui_objc",
"../system_wrappers:field_trial_default",
"../system_wrappers:metrics_default",
]
}
rtc_static_library("objc_corevideoframebuffer") {
rtc_static_library("corevideoframebuffer_objc") {
sources = [
"objc/Framework/Classes/Video/corevideo_frame_buffer.cc",
"objc/Framework/Classes/Video/corevideo_frame_buffer.h",
@ -706,7 +706,7 @@ if (is_ios || is_mac) {
libs = [ "CoreVideo.framework" ]
}
rtc_static_library("objc_videotoolbox") {
rtc_static_library("videotoolbox_objc") {
sources = [
"objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm",
"objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm",
@ -724,9 +724,9 @@ if (is_ios || is_mac) {
configs += [ "..:common_objc" ]
deps = [
":objc_common",
":objc_video",
":objc_videotracksource",
":common_objc",
":video_objc",
":videotracksource_objc",
"../api/video_codecs:video_codecs_api",
"../common_video",
"../media:rtc_media",

6
webrtc/test/BUILD.gn
View File

@ -162,7 +162,7 @@ rtc_source_set("test_support") {
}
if (is_ios && !build_with_chromium) {
deps += [ "../sdk:objc_common" ]
deps += [ "../sdk:common_objc" ]
}
if (rtc_use_memcheck) {
@ -242,7 +242,7 @@ if (!build_with_chromium) {
}
if (is_ios) {
deps += [ "../sdk:objc_common" ]
deps += [ "../sdk:common_objc" ]
}
if (rtc_use_memcheck) {
@ -359,7 +359,7 @@ if (is_ios) {
deps = [
"..:webrtc_common",
"../rtc_base:rtc_base_approved",
"../sdk:objc_common",
"../sdk:common_objc",
]
}
}