zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ios_helpers to sdk folder

Browse Source 
BUG=webrtc:5582

Review-Url: https://codereview.webrtc.org/2572743004
Cr-Commit-Position: refs/heads/master@{#15649}
This commit is contained in:
kthelgason
2016-12-16 02:12:42 -08:00
committed by Commit bot
parent 8d66245ccc
commit beafee3009
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_device/BUILD.gn
View File

@ -182,8 +182,6 @@ 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",

3
webrtc/modules/audio_device/DEPS
View File

@ -8,4 +8,7 @@ specific_include_rules = {
"ensure_initialized\.cc": [
"+base/android",
],
"audio_device_ios\.mm": [
"+webrtc/sdk/objc",
],
}

2
webrtc/modules/audio_device/ios/audio_device_ios.mm
View File

@ -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/audio_device/ios/helpers_ios.h"
#include "webrtc/sdk/objc/Framework/Classes/helpers.h"
#import "WebRTC/RTCLogging.h"
#import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h"

2
webrtc/sdk/BUILD.gn
View File

@ -62,6 +62,8 @@ if (is_ios || is_mac) {
"objc/Framework/Classes/RTCUIApplication.h",
"objc/Framework/Classes/RTCUIApplication.mm",
"objc/Framework/Classes/UIDevice+RTCDevice.mm",
"objc/Framework/Classes/helpers.h",
"objc/Framework/Classes/helpers.mm",
"objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
"objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
]

6
webrtc/modules/audio_device/ios/helpers_ios.h → webrtc/sdk/objc/Framework/Classes/helpers.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_
#define WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_
#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_HELPERS_H_
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_HELPERS_H_
#if defined(WEBRTC_IOS)
@ -74,4 +74,4 @@ bool GetLowPowerModeEnabled();
#endif // defined(WEBRTC_IOS)
#endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_HELPERS_IOS_H_
#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_HELPERS_H_

4
webrtc/modules/audio_device/ios/helpers_ios.mm → webrtc/sdk/objc/Framework/Classes/helpers.mm
View File

@ -19,7 +19,7 @@
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/modules/audio_device/ios/helpers_ios.h"
#include "webrtc/sdk/objc/Framework/Classes/helpers.h"
namespace webrtc {
namespace ios {
@ -86,8 +86,6 @@ const char* LookUpRealName(const char* raw_name) {
return "";
}
// TODO(henrika): move to shared location.
// See https://code.google.com/p/webrtc/issues/detail?id=4773 for details.
NSString* NSStringFromStdString(const std::string& stdString) {
// std::string may contain null termination character so we construct
// using length.