63ee39d0be
This reverts commit 181ea6e414c5982015ce161e6368120be3658ec4.
Reason for revert: Breaks downstream project. Kári will help to land it next week.
Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}
Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
62 lines
2.1 KiB
Plaintext
62 lines
2.1 KiB
Plaintext
/*
|
|
* Copyright 2015 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#if defined(WEBRTC_IOS)
|
|
|
|
#import <Foundation/Foundation.h>
|
|
#include <string.h>
|
|
|
|
#import "sdk/objc/helpers/NSString+StdString.h"
|
|
|
|
#include "absl/strings/string_view.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// For iOS, resource files are added to the application bundle in the root
|
|
// and not in separate folders as is the case for other platforms. This method
|
|
// therefore removes any prepended folders and uses only the actual file name.
|
|
std::string IOSResourcePath(absl::string_view name, absl::string_view extension) {
|
|
@autoreleasepool {
|
|
NSString* path = [NSString stringForAbslStringView:name];
|
|
NSString* fileName = path.lastPathComponent;
|
|
NSString* fileType = [NSString stringForAbslStringView:extension];
|
|
// Get full pathname for the resource identified by the name and extension.
|
|
NSString* pathString = [[NSBundle mainBundle] pathForResource:fileName
|
|
ofType:fileType];
|
|
return [NSString stdStringForString:pathString];
|
|
}
|
|
}
|
|
|
|
std::string IOSRootPath() {
|
|
@autoreleasepool {
|
|
NSBundle* mainBundle = [NSBundle mainBundle];
|
|
return [NSString stdStringForString:mainBundle.bundlePath] + "/";
|
|
}
|
|
}
|
|
|
|
// For iOS, we don't have access to the output directory. Return the path to the
|
|
// temporary directory instead. This is mostly used by tests that need to write
|
|
// output files to disk.
|
|
std::string IOSOutputPath() {
|
|
@autoreleasepool {
|
|
NSString* tempDir = NSTemporaryDirectory();
|
|
if (tempDir == nil)
|
|
tempDir = @"/tmp";
|
|
return [NSString stdStringForString:tempDir];
|
|
}
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // defined(WEBRTC_IOS)
|