3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-17 16:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Android and CrOS build after 414569987.

Browse Source 
Change-Id: Ifdc0dac02eac11f09eb14f4a713bea70f4680d83
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2278034
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
This commit is contained in:
Robert Sesek 2020-07-01 17:54:10 -04:00 committed by Commit Bot
parent 99ecfd3b52
commit 9f4741d4de
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
handler/handler_main.cc
View File

@ -215,7 +215,8 @@ struct Options {
base::FilePath minidump_dir_for_tests; base::FilePath minidump_dir_for_tests;
bool always_allow_feedback = false; bool always_allow_feedback = false;
#endif // OS_CHROMEOS #endif // OS_CHROMEOS
#if defined(OS_WIN) || defined (OS_LINUX) #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
defined(OS_ANDROID)
std::vector<base::FilePath> attachments; std::vector<base::FilePath> attachments;
#endif // OS_WIN || OS_LINUX #endif // OS_WIN || OS_LINUX
}; };
@ -523,7 +524,8 @@ int HandlerMain(int argc,
// Long options without short equivalents. // Long options without short equivalents.
kOptionLastChar = 255, kOptionLastChar = 255,
kOptionAnnotation, kOptionAnnotation,
#if defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
defined(OS_ANDROID)
kOptionAttachment, kOptionAttachment,
#endif // OS_WIN || OS_LINUX #endif // OS_WIN || OS_LINUX
kOptionDatabase, kOptionDatabase,
@ -690,7 +692,8 @@ int HandlerMain(int argc,
} }
break; break;
} }
#if defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
defined(OS_ANDROID)
case kOptionAttachment: { case kOptionAttachment: {
options.attachments.push_back(base::FilePath( options.attachments.push_back(base::FilePath(
ToolSupport::CommandLineArgumentToFilePathStringType(optarg))); ToolSupport::CommandLineArgumentToFilePathStringType(optarg)));
@ -999,6 +1002,7 @@ int HandlerMain(int argc,
database.get(), database.get(),
static_cast<CrashReportUploadThread*>(upload_thread.Get()), static_cast<CrashReportUploadThread*>(upload_thread.Get()),
&options.annotations, &options.annotations,
&options.attachments,
true, true,
false, false,
user_stream_sources); user_stream_sources);
@ -1008,7 +1012,7 @@ int HandlerMain(int argc,
database.get(), database.get(),
static_cast<CrashReportUploadThread*>(upload_thread.Get()), static_cast<CrashReportUploadThread*>(upload_thread.Get()),
&options.annotations, &options.annotations,
#if defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
&options.attachments, &options.attachments,
#endif // OS_WIN || OS_LINUX #endif // OS_WIN || OS_LINUX
#if defined(OS_ANDROID) #if defined(OS_ANDROID)