mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-26 23:01:05 +08:00
Roll mini_chromium putting /base/apple files into base:🍎:
Bug: chromium:1474628 Change-Id: Ief0efef22759b935045bf0216a313c2de8025403 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4799234 Reviewed-by: Mark Mentovai <mark@chromium.org> Commit-Queue: Avi Drissman <avi@chromium.org>
This commit is contained in:
parent
50ce1550a1
commit
a736f7d070
2
DEPS
2
DEPS
@ -47,7 +47,7 @@ deps = {
|
||||
'9719c1e1e676814c456b55f5f070eabad6709d31',
|
||||
'crashpad/third_party/mini_chromium/mini_chromium':
|
||||
Var('chromium_git') + '/chromium/mini_chromium@' +
|
||||
'e35fc73aa87bb27e10306900b15a18b0e9c7ca42',
|
||||
'0c540fd5462a266277e86fa32a230cad4a859037',
|
||||
'crashpad/third_party/libfuzzer/src':
|
||||
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
|
||||
'fda403cf93ecb8792cb1d061564d89a6553ca020',
|
||||
|
@ -130,7 +130,7 @@ launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
|
||||
base::apple::CFCastStrict<CFDataRef>(property_cf));
|
||||
data_launch = LaunchDataNewOpaque([data_ns bytes], [data_ns length]);
|
||||
} else {
|
||||
base::ScopedCFTypeRef<CFStringRef> type_name_cf(
|
||||
base::apple::ScopedCFTypeRef<CFStringRef> type_name_cf(
|
||||
CFCopyTypeIDDescription(type_id_cf));
|
||||
DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " ("
|
||||
<< base::SysCFStringRefToUTF8(type_name_cf) << ")";
|
||||
|
@ -166,7 +166,7 @@ bool StringToVersionNumbers(const std::string& version,
|
||||
|
||||
std::string IORegistryEntryDataPropertyAsString(io_registry_entry_t entry,
|
||||
CFStringRef key) {
|
||||
base::ScopedCFTypeRef<CFTypeRef> property(
|
||||
base::apple::ScopedCFTypeRef<CFTypeRef> property(
|
||||
IORegistryEntryCreateCFProperty(entry, key, kCFAllocatorDefault, 0));
|
||||
CFDataRef data = base::apple::CFCast<CFDataRef>(property);
|
||||
if (data && CFDataGetLength(data) > 0) {
|
||||
@ -235,7 +235,7 @@ bool MacOSVersionComponents(int* major,
|
||||
int* bugfix,
|
||||
std::string* build,
|
||||
std::string* version_string) {
|
||||
base::ScopedCFTypeRef<CFDictionaryRef> dictionary(
|
||||
base::apple::ScopedCFTypeRef<CFDictionaryRef> dictionary(
|
||||
TryCFCopySystemVersionDictionary());
|
||||
if (!dictionary) {
|
||||
LOG(ERROR) << "_CFCopySystemVersionDictionary failed";
|
||||
|
Loading…
x
Reference in New Issue
Block a user