
Reason for revert: Build issues have now _really_ been fixed Original issue's description: > Revert of move all reference to carbon api (patchset #2 id:300001 of https://codereview.webrtc.org/2321493002/ ) > > Reason for revert: > Still breaks Chromium mac compile: > [4542/22193] CXX obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > FAILED: obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > /b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/webrtc/base/rtc_base/unixfilesystem.o.d -DLOGGING=1 -DV8_DEPRECATION_WARNINGS -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PDF=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DDCHECK_ALWAYS_ON=1 -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DENABLE_WEBRTC=1 -DENABLE_EXTENSIONS=1 -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DUSE_PROPRIETARY_CODECS -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=280106-1 -DCR_XCODE_VERSION=0511 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DWEBRTC_RESTRICT_LOGGING -DEXPAT_RELATIVE_PATH -DENABLE_EXTERNAL_AUTH -DHAVE_OPENSSL_SSL_H -DHAVE_SCTP -DHAVE_SRTP -DHAVE_WEBRTC_VIDEO -DHAVE_WEBRTC_VOICE -DLOGGING_INSIDE_WEBRTC -DSRTP_RELATIVE_PATH -DSSL_USE_OPENSSL -DUSE_WEBRTC_DEV_BRANCH -DSSL_USE_OPENSSL -DHAVE_OPENSSL_SSL_H -DFEATURE_ENABLE_SSL -DLOGGING=1 -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_MAC -DNO_MAIN_THREAD_WRAPPING -I../../third_party/webrtc_overrides -I../../third_party/boringssl/src/include -I../.. -Igen -I../../third_party/jsoncpp/overrides/include -I../../third_party/jsoncpp/source/include -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/boringssl/src/include -Wno-uninitialized -fno-strict-aliasing -fstack-protector -fcolor-diagnostics -arch x86_64 -O2 -g1 -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -mmacosx-version-min=10.7 -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -Werror -Wall -Wno-unused-variable -Wpartial-availability -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -fno-threadsafe-statics -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -c ../../third_party/webrtc/base/unixfilesystem.cc -o obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > ../../third_party/webrtc/base/unixfilesystem.cc:375:11: error: variable has incomplete type 'FSRef' > FSRef fr; > ^ > /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFURL.h:467:8: note: forward declaration of 'FSRef' > struct FSRef; > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:376:27: error: use of undeclared identifier 'kUserDomain' > if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType, > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:376:40: error: use of undeclared identifier 'kApplicationSupportFolderType' > if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType, > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:377:27: error: use of undeclared identifier 'kCreateFolder'; did you mean 'CreateFolder'? > kCreateFolder, &fr)) > ^~~~~~~~~~~~~ > CreateFolder > ../../third_party/webrtc/base/unixfilesystem.cc:92:22: note: 'CreateFolder' declared here > bool UnixFilesystem::CreateFolder(const Pathname &path, mode_t mode) { > > Original issue's description: > > Reland of move all reference to carbon api (patchset #1 id:1 of https://codereview.webrtc.org/2316563002/ ) > > > > Reason for revert: > > Chromium build issues have been resolved. > > > > Original issue's description: > > > Revert of Remove all reference to carbon api (patchset #2 id:20001 of https://codereview.webrtc.org/2299633002/ ) > > > > > > Reason for revert: > > > Breaks chromium build > > > > > > Original issue's description: > > > > Remove all reference to carbon api > > > > > > > > BUG=webrtc:6282 > > > > > > > > Committed: https://crrev.com/dbd8b6bec4143c940b2f2ca8cd85c25d17327964 > > > > Cr-Commit-Position: refs/heads/master@{#14080} > > > > > > TBR=magjed@webrtc.org,mflodman@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:6282 > > > > > > Committed: https://crrev.com/b096aa7fd375a980daab3a986596548ca5de2a1c > > > Cr-Commit-Position: refs/heads/master@{#14081} > > > > TBR=magjed@webrtc.org,mflodman@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:6282 > > > > Committed: https://crrev.com/a90879b64fd8db57c0274169311d6b51dd59f1a0 > > Cr-Commit-Position: refs/heads/master@{#14125} > > TBR=mflodman@webrtc.org,kthelgason@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6282 > > Committed: https://crrev.com/4e0581f543b026cbc31c3b24cf65c7f51dcd6124 > Cr-Commit-Position: refs/heads/master@{#14133} TBR=mflodman@webrtc.org,magjed@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6282 Review-Url: https://codereview.webrtc.org/2327573002 Cr-Commit-Position: refs/heads/master@{#14155}
133 lines
3.5 KiB
C++
133 lines
3.5 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 <memory>
|
|
#include <sstream>
|
|
|
|
#include <CoreServices/CoreServices.h>
|
|
|
|
#include "webrtc/base/common.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 ((NULL == str16) || (NULL == 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 (NULL == str16) {
|
|
return false;
|
|
}
|
|
*str16 = CFStringCreateWithBytes(kCFAllocatorDefault,
|
|
reinterpret_cast<const UInt8*>(str8.data()),
|
|
str8.length(), kCFStringEncodingUTF8,
|
|
false);
|
|
return NULL != *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 GetGestalt(OSType ostype, int* value) {
|
|
ASSERT(NULL != value);
|
|
SInt32 native_value;
|
|
OSStatus result = Gestalt(ostype, &native_value);
|
|
if (noErr == result) {
|
|
*value = native_value;
|
|
return true;
|
|
}
|
|
std::string str;
|
|
DecodeFourChar(ostype, &str);
|
|
LOG_E(LS_ERROR, OS, result) << "Gestalt(" << str << ")";
|
|
return false;
|
|
}
|
|
|
|
static bool GetOSVersion(int* major, int* minor, int* bugfix) {
|
|
ASSERT(major && minor && bugfix);
|
|
if (!GetGestalt(gestaltSystemVersion, major)) {
|
|
return false;
|
|
}
|
|
if (*major < 0x1040) {
|
|
*bugfix = *major & 0xF;
|
|
*minor = (*major >> 4) & 0xF;
|
|
*major = (*major >> 8);
|
|
return true;
|
|
}
|
|
return GetGestalt(gestaltSystemVersionMajor, major) &&
|
|
GetGestalt(gestaltSystemVersionMinor, minor) &&
|
|
GetGestalt(gestaltSystemVersionBugFix, bugfix);
|
|
}
|
|
|
|
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
|