| Index: BUILD.gn
|
| diff --git a/BUILD.gn b/BUILD.gn
|
| index 40368597b22dc5cab2ef3215c8d6bd8159defd64..442d1ec1bbc8229a5b17954248907b47995eb610 100644
|
| --- a/BUILD.gn
|
| +++ b/BUILD.gn
|
| @@ -164,51 +164,52 @@ config("common_config") {
|
| ]
|
| }
|
| }
|
| +if (!is_ios) {
|
| + source_set("webrtc") {
|
| + sources = [
|
| + "call.h",
|
| + "config.h",
|
| + "frame_callback.h",
|
| + "transport.h",
|
| + ]
|
|
|
| -source_set("webrtc") {
|
| - sources = [
|
| - "call.h",
|
| - "config.h",
|
| - "frame_callback.h",
|
| - "transport.h",
|
| - ]
|
| -
|
| - defines = []
|
| - configs += [ ":common_config" ]
|
| - public_configs = [ ":common_inherited_config" ]
|
| -
|
| - deps = [
|
| - ":webrtc_common",
|
| - "base:rtc_base",
|
| - "common_audio",
|
| - "common_video",
|
| - "modules/audio_coding",
|
| - "modules/audio_conference_mixer",
|
| - "modules/audio_device",
|
| - "modules/audio_processing",
|
| - "modules/bitrate_controller",
|
| - "modules/desktop_capture",
|
| - "modules/media_file",
|
| - "modules/rtp_rtcp",
|
| - "modules/utility",
|
| - "modules/video_coding",
|
| - "modules/video_processing",
|
| - "system_wrappers",
|
| - "tools",
|
| - "video",
|
| - "voice_engine",
|
| - ]
|
| + defines = []
|
| + configs += [ ":common_config" ]
|
| + public_configs = [ ":common_inherited_config" ]
|
|
|
| - if (build_with_chromium) {
|
| - deps += [
|
| - "modules/video_capture",
|
| - "modules/video_render",
|
| + deps = [
|
| + ":webrtc_common",
|
| + "base:rtc_base",
|
| + "common_audio",
|
| + "common_video",
|
| + "modules/audio_coding",
|
| + "modules/audio_conference_mixer",
|
| + "modules/audio_device",
|
| + "modules/audio_processing",
|
| + "modules/bitrate_controller",
|
| + "modules/desktop_capture",
|
| + "modules/media_file",
|
| + "modules/rtp_rtcp",
|
| + "modules/utility",
|
| + "modules/video_coding",
|
| + "modules/video_processing",
|
| + "system_wrappers",
|
| + "tools",
|
| + "video",
|
| + "voice_engine",
|
| ]
|
| - }
|
|
|
| - if (rtc_enable_protobuf) {
|
| - defines += [ "ENABLE_RTC_EVENT_LOG" ]
|
| - deps += [ ":rtc_event_log_proto" ]
|
| + if (build_with_chromium) {
|
| + deps += [
|
| + "modules/video_capture",
|
| + "modules/video_render",
|
| + ]
|
| + }
|
| +
|
| + if (rtc_enable_protobuf) {
|
| + defines += [ "ENABLE_RTC_EVENT_LOG" ]
|
| + deps += [ ":rtc_event_log_proto" ]
|
| + }
|
| }
|
| }
|
|
|
| @@ -244,36 +245,38 @@ source_set("gtest_prod") {
|
| ]
|
| }
|
|
|
| -if (rtc_enable_protobuf) {
|
| - proto_library("rtc_event_log_proto") {
|
| - sources = [
|
| - "video/rtc_event_log.proto",
|
| - ]
|
| - proto_out_dir = "webrtc/video"
|
| +if (!is_ios) {
|
| + if (rtc_enable_protobuf) {
|
| + proto_library("rtc_event_log_proto") {
|
| + sources = [
|
| + "video/rtc_event_log.proto",
|
| + ]
|
| + proto_out_dir = "webrtc/video"
|
| + }
|
| }
|
| -}
|
|
|
| -source_set("rtc_event_log") {
|
| - sources = [
|
| - "video/rtc_event_log.cc",
|
| - "video/rtc_event_log.h",
|
| - ]
|
| + source_set("rtc_event_log") {
|
| + sources = [
|
| + "video/rtc_event_log.cc",
|
| + "video/rtc_event_log.h",
|
| + ]
|
|
|
| - defines = []
|
| - configs += [ ":common_config" ]
|
| - public_configs = [ ":common_inherited_config" ]
|
| + defines = []
|
| + configs += [ ":common_config" ]
|
| + public_configs = [ ":common_inherited_config" ]
|
|
|
| - deps = [
|
| - ":webrtc_common",
|
| - ]
|
| + deps = [
|
| + ":webrtc_common",
|
| + ]
|
|
|
| - if (rtc_enable_protobuf) {
|
| - defines += [ "ENABLE_RTC_EVENT_LOG" ]
|
| - deps += [ ":rtc_event_log_proto" ]
|
| - }
|
| - if (is_clang && !is_nacl) {
|
| - # Suppress warnings from Chrome's Clang plugins.
|
| - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
| - configs -= [ "//build/config/clang:find_bad_constructs" ]
|
| + if (rtc_enable_protobuf) {
|
| + defines += [ "ENABLE_RTC_EVENT_LOG" ]
|
| + deps += [ ":rtc_event_log_proto" ]
|
| + }
|
| + if (is_clang && !is_nacl) {
|
| + # Suppress warnings from Chrome's Clang plugins.
|
| + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
|
| + configs -= [ "//build/config/clang:find_bad_constructs" ]
|
| + }
|
| }
|
| }
|
|
|