From 5de9b6a3ec7e909b2628840b50c06a26b28b899d Mon Sep 17 00:00:00 2001 From: solenberg Date: Fri, 25 Nov 2016 00:47:04 -0800 Subject: [PATCH] Move helpers_ios.cc/.h - Out from modules/utility/ and into modules/audio_device/ios/ - there they are used. BUG=none Review-Url: https://codereview.webrtc.org/2526273002 Cr-Commit-Position: refs/heads/master@{#15236} --- webrtc/modules/audio_device/BUILD.gn | 2 ++ webrtc/modules/audio_device/ios/audio_device_ios.mm | 2 +- .../{utility/include => audio_device/ios}/helpers_ios.h | 6 +++--- .../{utility/source => audio_device/ios}/helpers_ios.mm | 2 +- webrtc/modules/audio_device/test/audio_device_test_api.cc | 1 + .../modules/audio_device/test/audio_device_test_defines.h | 1 - webrtc/modules/utility/BUILD.gn | 1 - 7 files changed, 8 insertions(+), 7 deletions(-) rename webrtc/modules/{utility/include => audio_device/ios}/helpers_ios.h (92%) rename webrtc/modules/{utility/source => audio_device/ios}/helpers_ios.mm (99%) diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn index 63def05451..7a0bce0736 100644 --- a/webrtc/modules/audio_device/BUILD.gn +++ b/webrtc/modules/audio_device/BUILD.gn @@ -184,6 +184,8 @@ rtc_static_library("audio_device") { "ios/audio_device_ios.mm", "ios/audio_device_not_implemented_ios.mm", "ios/audio_session_observer.h", + "ios/helpers_ios.h", + "ios/helpers_ios.mm", "ios/objc/RTCAudioSession+Configuration.mm", "ios/objc/RTCAudioSession+Private.h", "ios/objc/RTCAudioSession.h", diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.mm b/webrtc/modules/audio_device/ios/audio_device_ios.mm index 0b01cdc9ad..ed8dbad784 100644 --- a/webrtc/modules/audio_device/ios/audio_device_ios.mm +++ b/webrtc/modules/audio_device/ios/audio_device_ios.mm @@ -25,7 +25,7 @@ #include "webrtc/base/thread.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_device/fine_audio_buffer.h" -#include "webrtc/modules/utility/include/helpers_ios.h" +#include "webrtc/modules/audio_device/ios/helpers_ios.h" #import "WebRTC/RTCLogging.h" #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h" diff --git a/webrtc/modules/utility/include/helpers_ios.h b/webrtc/modules/audio_device/ios/helpers_ios.h similarity index 92% rename from webrtc/modules/utility/include/helpers_ios.h rename to webrtc/modules/audio_device/ios/helpers_ios.h index 1b692f18c1..6256046217 100644 --- a/webrtc/modules/utility/include/helpers_ios.h +++ b/webrtc/modules/audio_device/ios/helpers_ios.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_IOS_H_ -#define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_IOS_H_ +#ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_ +#define WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_ #if defined(WEBRTC_IOS) @@ -74,4 +74,4 @@ bool GetLowPowerModeEnabled(); #endif // defined(WEBRTC_IOS) -#endif // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_IOS_H_ +#endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_ diff --git a/webrtc/modules/utility/source/helpers_ios.mm b/webrtc/modules/audio_device/ios/helpers_ios.mm similarity index 99% rename from webrtc/modules/utility/source/helpers_ios.mm rename to webrtc/modules/audio_device/ios/helpers_ios.mm index 5e827a88d1..9a976c0384 100644 --- a/webrtc/modules/utility/source/helpers_ios.mm +++ b/webrtc/modules/audio_device/ios/helpers_ios.mm @@ -19,7 +19,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" -#include "webrtc/modules/utility/include/helpers_ios.h" +#include "webrtc/modules/audio_device/ios/helpers_ios.h" namespace webrtc { namespace ios { diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc index 2e511464f7..2f2780685d 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc @@ -21,6 +21,7 @@ #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_impl.h" +#include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/system_wrappers/include/sleep.h" // Helper functions diff --git a/webrtc/modules/audio_device/test/audio_device_test_defines.h b/webrtc/modules/audio_device/test/audio_device_test_defines.h index cc8e3e3aef..60f98f4a8f 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_defines.h +++ b/webrtc/modules/audio_device/test/audio_device_test_defines.h @@ -13,7 +13,6 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/system_wrappers/include/trace.h" #ifdef _WIN32 diff --git a/webrtc/modules/utility/BUILD.gn b/webrtc/modules/utility/BUILD.gn index c472c3ec6a..b8f5f2ebaf 100644 --- a/webrtc/modules/utility/BUILD.gn +++ b/webrtc/modules/utility/BUILD.gn @@ -22,7 +22,6 @@ rtc_static_library("utility") { "source/file_player.cc", "source/file_recorder.cc", "source/helpers_android.cc", - "source/helpers_ios.mm", "source/jvm_android.cc", "source/process_thread_impl.cc", "source/process_thread_impl.h",