This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
126 lines
3.2 KiB
C++
126 lines
3.2 KiB
C++
/*
|
|
* Copyright 2007 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.
|
|
*/
|
|
|
|
#include <cstring>
|
|
#include <memory>
|
|
#include <sstream>
|
|
|
|
#include <sys/utsname.h>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/base/macutils.h"
|
|
#include "webrtc/base/stringutils.h"
|
|
|
|
namespace rtc {
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
bool ToUtf8(const CFStringRef str16, std::string* str8) {
|
|
if ((nullptr == str16) || (nullptr == str8)) {
|
|
return false;
|
|
}
|
|
size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16),
|
|
kCFStringEncodingUTF8) + 1;
|
|
std::unique_ptr<char[]> buffer(new char[maxlen]);
|
|
if (!buffer || !CFStringGetCString(str16, buffer.get(), maxlen,
|
|
kCFStringEncodingUTF8)) {
|
|
return false;
|
|
}
|
|
str8->assign(buffer.get());
|
|
return true;
|
|
}
|
|
|
|
bool ToUtf16(const std::string& str8, CFStringRef* str16) {
|
|
if (nullptr == str16) {
|
|
return false;
|
|
}
|
|
*str16 = CFStringCreateWithBytes(kCFAllocatorDefault,
|
|
reinterpret_cast<const UInt8*>(str8.data()),
|
|
str8.length(), kCFStringEncodingUTF8,
|
|
false);
|
|
return nullptr != *str16;
|
|
}
|
|
|
|
void DecodeFourChar(UInt32 fc, std::string* out) {
|
|
std::stringstream ss;
|
|
ss << '\'';
|
|
bool printable = true;
|
|
for (int i = 3; i >= 0; --i) {
|
|
char ch = (fc >> (8 * i)) & 0xFF;
|
|
if (isprint(static_cast<unsigned char>(ch))) {
|
|
ss << ch;
|
|
} else {
|
|
printable = false;
|
|
break;
|
|
}
|
|
}
|
|
if (printable) {
|
|
ss << '\'';
|
|
} else {
|
|
ss.str("");
|
|
ss << "0x" << std::hex << fc;
|
|
}
|
|
out->append(ss.str());
|
|
}
|
|
|
|
static bool GetOSVersion(int* major, int* minor, int* bugfix) {
|
|
RTC_DCHECK(major && minor && bugfix);
|
|
struct utsname uname_info;
|
|
if (uname(&uname_info) != 0)
|
|
return false;
|
|
|
|
if (strcmp(uname_info.sysname, "Darwin") != 0)
|
|
return false;
|
|
*major = 10;
|
|
|
|
// The market version of macOS is always 4 lower than the internal version.
|
|
int minor_version = atoi(uname_info.release);
|
|
RTC_CHECK(minor_version >= 6);
|
|
*minor = minor_version - 4;
|
|
|
|
const char* dot = ::strchr(uname_info.release, '.');
|
|
if (!dot)
|
|
return false;
|
|
*bugfix = atoi(dot + 1);
|
|
return true;
|
|
}
|
|
|
|
MacOSVersionName GetOSVersionName() {
|
|
int major = 0, minor = 0, bugfix = 0;
|
|
if (!GetOSVersion(&major, &minor, &bugfix)) {
|
|
return kMacOSUnknown;
|
|
}
|
|
if (major > 10) {
|
|
return kMacOSNewer;
|
|
}
|
|
if ((major < 10) || (minor < 3)) {
|
|
return kMacOSOlder;
|
|
}
|
|
switch (minor) {
|
|
case 3:
|
|
return kMacOSPanther;
|
|
case 4:
|
|
return kMacOSTiger;
|
|
case 5:
|
|
return kMacOSLeopard;
|
|
case 6:
|
|
return kMacOSSnowLeopard;
|
|
case 7:
|
|
return kMacOSLion;
|
|
case 8:
|
|
return kMacOSMountainLion;
|
|
case 9:
|
|
return kMacOSMavericks;
|
|
}
|
|
return kMacOSNewer;
|
|
}
|
|
} // namespace rtc
|