| OLD | NEW |
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 } | 233 } |
| 234 } | 234 } |
| 235 | 235 |
| 236 config("common_objc") { | 236 config("common_objc") { |
| 237 cflags = [ "-Wobjc-missing-property-synthesis" ] | 237 cflags = [ "-Wobjc-missing-property-synthesis" ] |
| 238 | 238 |
| 239 precompiled_header = "sdk/objc/WebRTC-Prefix.pch" | 239 precompiled_header = "sdk/objc/WebRTC-Prefix.pch" |
| 240 precompiled_source = "sdk/objc/WebRTC-Prefix.pch" | 240 precompiled_source = "sdk/objc/WebRTC-Prefix.pch" |
| 241 } | 241 } |
| 242 | 242 |
| 243 source_set("webrtc") { | 243 if (!is_ios || !build_with_chromium) { |
| 244 sources = [ | 244 source_set("webrtc") { |
| 245 "call.h", | 245 sources = [ |
| 246 "config.h", | 246 "call.h", |
| 247 "transport.h", | 247 "config.h", |
| 248 ] | 248 "transport.h", |
| 249 ] |
| 249 | 250 |
| 250 defines = [] | 251 defines = [] |
| 251 configs += [ ":common_config" ] | 252 configs += [ ":common_config" ] |
| 252 public_configs = [ ":common_inherited_config" ] | 253 public_configs = [ ":common_inherited_config" ] |
| 253 | 254 |
| 254 deps = [ | 255 deps = [ |
| 255 ":webrtc_common", | 256 ":webrtc_common", |
| 256 "audio", | 257 "audio", |
| 257 "base:rtc_base", | 258 "base:rtc_base", |
| 258 "call", | 259 "call", |
| 259 "common_audio", | 260 "common_audio", |
| 260 "common_video", | 261 "common_video", |
| 261 "modules", | 262 "modules", |
| 262 "system_wrappers", | 263 "system_wrappers", |
| 263 "tools", | 264 "tools", |
| 264 "video", | 265 "video", |
| 265 "voice_engine", | 266 "voice_engine", |
| 266 ] | 267 ] |
| 267 | 268 |
| 268 if (build_with_chromium) { | 269 if (build_with_chromium) { |
| 269 deps += [ "modules/video_capture" ] | 270 deps += [ "modules/video_capture" ] |
| 270 } else { | 271 } else { |
| 271 # TODO(kjellander): Enable for Chromium as well when bugs.webrtc.org/4256 is | 272 # TODO(kjellander): Enable for Chromium as well when bugs.webrtc.org/4256 |
| 272 # fixed. Right now it's not possible due to circular dependencies. | 273 # is fixed. Right now it's not possible due to circular dependencies. |
| 273 deps += [ | 274 deps += [ |
| 274 "api", | 275 "api", |
| 275 "media", | 276 "media", |
| 276 "p2p", | 277 "p2p", |
| 277 "pc", | 278 "pc", |
| 278 ] | 279 ] |
| 279 } | 280 } |
| 280 | 281 |
| 281 if (rtc_enable_protobuf) { | 282 if (rtc_enable_protobuf) { |
| 282 defines += [ "ENABLE_RTC_EVENT_LOG" ] | 283 defines += [ "ENABLE_RTC_EVENT_LOG" ] |
| 283 deps += [ ":rtc_event_log_proto" ] | 284 deps += [ ":rtc_event_log_proto" ] |
| 285 } |
| 284 } | 286 } |
| 285 } | 287 } |
| 286 | 288 |
| 287 if (!build_with_chromium) { | 289 if (!build_with_chromium) { |
| 288 executable("webrtc_tests") { | 290 executable("webrtc_tests") { |
| 289 testonly = true | 291 testonly = true |
| 290 deps = [ | 292 deps = [ |
| 291 ":webrtc", | 293 ":webrtc", |
| 292 "modules/video_capture:video_capture_internal_impl", | 294 "modules/video_capture:video_capture_internal_impl", |
| 293 "test", | 295 "test", |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 if (is_ios || (is_mac && target_cpu != "x86")) { | 730 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 729 defines = [ "CARBON_DEPRECATED=YES" ] | 731 defines = [ "CARBON_DEPRECATED=YES" ] |
| 730 } | 732 } |
| 731 if (is_clang) { | 733 if (is_clang) { |
| 732 # Suppress warnings from the Chromium Clang plugin. | 734 # Suppress warnings from the Chromium Clang plugin. |
| 733 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 735 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 734 configs -= [ "//build/config/clang:find_bad_constructs" ] | 736 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 735 } | 737 } |
| 736 } | 738 } |
| 737 } | 739 } |
| OLD | NEW |