Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright 2016 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 import("../webrtc.gni") | 9 import("../webrtc.gni") |
| 10 if (is_ios) { | 10 if (is_ios) { |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 if (!build_with_chromium) { | 87 if (!build_with_chromium) { |
| 88 sources += [ | 88 sources += [ |
| 89 "objc/Framework/Classes/RTCFileLogger.mm", | 89 "objc/Framework/Classes/RTCFileLogger.mm", |
| 90 "objc/Framework/Headers/WebRTC/RTCFileLogger.h", | 90 "objc/Framework/Headers/WebRTC/RTCFileLogger.h", |
| 91 ] | 91 ] |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 | 94 |
| 95 rtc_static_library("rtc_sdk_peerconnection_objc") { | 95 rtc_static_library("rtc_sdk_peerconnection_objc") { |
| 96 sources = [ | 96 sources = [ |
| 97 "objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h", | |
| 97 "objc/Framework/Classes/RTCAVFoundationVideoCapturerInternal.h", | 98 "objc/Framework/Classes/RTCAVFoundationVideoCapturerInternal.h", |
| 98 "objc/Framework/Classes/RTCAVFoundationVideoCapturerInternal.mm", | 99 "objc/Framework/Classes/RTCAVFoundationVideoCapturerInternal.mm", |
| 99 "objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h", | 100 "objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h", |
| 100 "objc/Framework/Classes/RTCAVFoundationVideoSource.mm", | 101 "objc/Framework/Classes/RTCAVFoundationVideoSource.mm", |
| 101 "objc/Framework/Classes/RTCAudioSource+Private.h", | 102 "objc/Framework/Classes/RTCAudioSource+Private.h", |
| 102 "objc/Framework/Classes/RTCAudioSource.mm", | 103 "objc/Framework/Classes/RTCAudioSource.mm", |
| 103 "objc/Framework/Classes/RTCAudioTrack+Private.h", | 104 "objc/Framework/Classes/RTCAudioTrack+Private.h", |
| 104 "objc/Framework/Classes/RTCAudioTrack.mm", | 105 "objc/Framework/Classes/RTCAudioTrack.mm", |
| 105 "objc/Framework/Classes/RTCConfiguration+Private.h", | 106 "objc/Framework/Classes/RTCConfiguration+Private.h", |
| 106 "objc/Framework/Classes/RTCConfiguration.mm", | 107 "objc/Framework/Classes/RTCConfiguration.mm", |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 } | 247 } |
| 247 | 248 |
| 248 if (rtc_include_tests) { | 249 if (rtc_include_tests) { |
| 249 rtc_source_set("rtc_sdk_peerconnection_objc_unittests") { | 250 rtc_source_set("rtc_sdk_peerconnection_objc_unittests") { |
| 250 testonly = true | 251 testonly = true |
| 251 sources = [ | 252 sources = [ |
| 252 "objc/Framework/UnitTests/RTCConfigurationTest.mm", | 253 "objc/Framework/UnitTests/RTCConfigurationTest.mm", |
| 253 "objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm", | 254 "objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm", |
| 254 "objc/Framework/UnitTests/RTCIceCandidateTest.mm", | 255 "objc/Framework/UnitTests/RTCIceCandidateTest.mm", |
| 255 "objc/Framework/UnitTests/RTCIceServerTest.mm", | 256 "objc/Framework/UnitTests/RTCIceServerTest.mm", |
| 257 "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm", | |
| 256 "objc/Framework/UnitTests/RTCMediaConstraintsTest.mm", | 258 "objc/Framework/UnitTests/RTCMediaConstraintsTest.mm", |
| 257 "objc/Framework/UnitTests/RTCSessionDescriptionTest.mm", | 259 "objc/Framework/UnitTests/RTCSessionDescriptionTest.mm", |
| 258 "objc/Framework/UnitTests/avformatmappertests.mm", | 260 "objc/Framework/UnitTests/avformatmappertests.mm", |
| 259 ] | 261 ] |
| 262 if (current_cpu != "arm64") { | |
|
kthelgason
2017/03/02 08:23:05
Isn't this conditional the wrong way around?
| |
| 263 sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ] | |
|
magjed_webrtc
2017/03/02 13:28:18
Is it ok to always do:
sources += [ "objc/Framewor
daniela-webrtc
2017/03/03 08:47:01
Yes, it's added twice for arm64 in that case and c
| |
| 264 } | |
| 260 deps = [ | 265 deps = [ |
| 261 ":rtc_sdk_peerconnection_objc", | 266 ":rtc_sdk_peerconnection_objc", |
| 262 "//third_party/ocmock", | 267 "//third_party/ocmock", |
| 263 "//webrtc/system_wrappers:system_wrappers_default", | 268 "//webrtc/system_wrappers:system_wrappers_default", |
| 264 ] | 269 ] |
| 265 | 270 |
| 266 # TODO(tkchin): Cleanup this warning. | 271 # TODO(tkchin): Cleanup this warning. |
| 267 cflags = [ "-Wno-objc-property-no-attribute" ] | 272 cflags = [ "-Wno-objc-property-no-attribute" ] |
| 268 | 273 |
| 269 # |-ObjC| flag needed to make sure category method implementations | 274 # |-ObjC| flag needed to make sure category method implementations |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 412 deps += [ "$rtc_libyuv_dir" ] | 417 deps += [ "$rtc_libyuv_dir" ] |
| 413 public_deps = [ | 418 public_deps = [ |
| 414 "$rtc_libyuv_dir", | 419 "$rtc_libyuv_dir", |
| 415 ] | 420 ] |
| 416 } else { | 421 } else { |
| 417 # Need to add a directory normally exported by libyuv. | 422 # Need to add a directory normally exported by libyuv. |
| 418 include_dirs = [ "$rtc_libyuv_dir/include" ] | 423 include_dirs = [ "$rtc_libyuv_dir/include" ] |
| 419 } | 424 } |
| 420 } | 425 } |
| 421 } | 426 } |
| OLD | NEW |