Index: webrtc/modules/audio_device/BUILD.gn |
diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn |
index 6cf2ea79cea59690600ea4e3cd11ed10e373e0a8..15bf21b96d395b566442a5b931ef0a9eb45ae1d4 100644 |
--- a/webrtc/modules/audio_device/BUILD.gn |
+++ b/webrtc/modules/audio_device/BUILD.gn |
@@ -45,6 +45,41 @@ config("audio_device_warnings_config") { |
} |
} |
+if (rtc_include_internal_audio_device && (is_ios || is_mac)) { |
+ rtc_static_library("objc_audio_device") { |
kjellander_webrtc
2017/08/14 06:54:13
I prefer audio_device_objc
mbonadei
2017/08/16 09:15:25
Done.
|
+ sources = [ |
+ "ios/audio_device_ios.h", |
+ "ios/audio_device_ios.mm", |
+ "ios/audio_device_not_implemented_ios.mm", |
+ "ios/audio_session_observer.h", |
+ "ios/objc/RTCAudioSessionDelegateAdapter.h", |
+ "ios/objc/RTCAudioSessionDelegateAdapter.mm", |
+ "ios/voice_processing_audio_unit.h", |
+ "ios/voice_processing_audio_unit.mm", |
+ ] |
+ libs = [ |
+ "AudioToolbox.framework", |
+ "AVFoundation.framework", |
+ "Foundation.framework", |
+ "UIKit.framework", |
+ ] |
+ check_includes = false |
kjellander_webrtc
2017/08/14 06:54:14
we usually have this earlier in the target. I'm no
mbonadei
2017/08/16 09:15:25
Right. This has been removed in ps#6 because the c
|
+ deps = [ |
+ # There is a cyclic dependency with :audio_device |
kjellander_webrtc
2017/08/14 06:54:13
I prefer to have this comment at the check_include
mbonadei
2017/08/16 09:15:25
Done.
|
+ # ":audio_device", |
+ "../../rtc_base:gtest_prod", |
+ "../../rtc_base:rtc_base", |
+ "../../sdk:objc_audio", |
+ "../../sdk:objc_common", |
+ "../../system_wrappers:metrics_api", |
+ ] |
+ if (!build_with_chromium && is_clang) { |
+ # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
+ suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
+ } |
+ } |
+} |
+ |
rtc_static_library("audio_device") { |
public_configs = [ ":audio_device_config" ] |
@@ -176,28 +211,7 @@ rtc_static_library("audio_device") { |
] |
} |
if (is_ios) { |
kjellander_webrtc
2017/08/16 09:31:53
I think this would have caused an error if rtc_inc
kjellander_webrtc
2017/08/16 09:33:09
To be clear: you are fixing this in your CL, so th
|
- public_deps = [ |
- "../../rtc_base:gtest_prod", |
- "../../rtc_base:rtc_base", |
- "../../sdk:objc_audio", |
- "../../sdk:objc_common", |
- ] |
- sources += [ |
- "ios/audio_device_ios.h", |
- "ios/audio_device_ios.mm", |
- "ios/audio_device_not_implemented_ios.mm", |
- "ios/audio_session_observer.h", |
- "ios/objc/RTCAudioSessionDelegateAdapter.h", |
- "ios/objc/RTCAudioSessionDelegateAdapter.mm", |
- "ios/voice_processing_audio_unit.h", |
- "ios/voice_processing_audio_unit.mm", |
- ] |
- libs = [ |
- "AudioToolbox.framework", |
- "AVFoundation.framework", |
- "Foundation.framework", |
- "UIKit.framework", |
- ] |
+ deps += [ ":objc_audio_device" ] |
} |
if (is_win) { |
sources += [ |
@@ -266,6 +280,32 @@ rtc_source_set("mock_audio_device") { |
} |
if (rtc_include_tests) { |
+ # TODO(kthelgason): Reenable these tests on simulator. |
+ # See bugs.webrtc.org/7812 |
+ if (is_ios && !use_ios_simulator) { |
+ rtc_source_set("objc_audio_device_unittests") { |
kjellander_webrtc
2017/08/14 06:54:13
audio_device_objc_unittests
mbonadei
2017/08/16 09:15:25
Done.
|
+ testonly = true |
+ sources = [ |
+ "ios/audio_device_unittest_ios.mm", |
+ ] |
+ deps = [ |
+ ":audio_device", |
+ ":mock_audio_device", |
+ ":objc_audio_device", |
+ "../../rtc_base:rtc_base_approved", |
+ "../../sdk:objc_audio", |
+ "../../system_wrappers", |
+ "../../test:test_support", |
+ "//testing/gmock", |
+ "//third_party/ocmock", |
+ ] |
+ if (!build_with_chromium && is_clang) { |
+ # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
+ suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
+ } |
+ } |
+ } |
+ |
rtc_source_set("audio_device_unittests") { |
testonly = true |
@@ -282,7 +322,7 @@ if (rtc_include_tests) { |
":audio_device", |
":mock_audio_device", |
"../../rtc_base:rtc_base_approved", |
- "../../system_wrappers:system_wrappers", |
+ "../../system_wrappers", |
"../../test:test_support", |
"../utility:utility", |
"//testing/gmock", |
@@ -307,12 +347,6 @@ if (rtc_include_tests) { |
"../../sdk/android:libjingle_peerconnection_java", |
] |
} |
- if (is_ios && !use_ios_simulator) { |
- # TODO(kthelgason): Reenable these tests on simulator. |
- # See bugs.webrtc.org/7812 |
- sources += [ "ios/audio_device_unittest_ios.mm" ] |
- deps += [ "//third_party/ocmock" ] |
- } |
if (!build_with_chromium && is_clang) { |
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |