UNLOZE/sm-ext-accelerator-2023
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update compatibility with newest breakpad

Browse Source
This commit is contained in:
Vladimir 2022-09-04 11:10:35 +03:00
parent cd575aa388
commit aedfd27b54
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
breakpad.sh
View File

@ -8,7 +8,7 @@ fi
cd breakpad cd breakpad
if [ ! -d "depot_tools" ]; then if [ ! -d "depot_tools" ]; then
git clone --depth=1 --branch=master https://chromium.googlesource.com/chromium/tools/depot_tools.git depot_tools git clone --depth=1 --branch=main https://chromium.googlesource.com/chromium/tools/depot_tools.git depot_tools
fi fi
if [ ! -d "src" ]; then if [ ! -d "src" ]; then
@ -31,7 +31,7 @@ fi
cd build cd build
../src/configure --enable-m32 CXXFLAGS="-g -O2 -D_GLIBCXX_USE_CXX11_ABI=0" ../src/configure --enable-m32 CFLAGS="-Wno-error=deprecated" CXXFLAGS="-Wno-error=deprecated -g -O2 -D_GLIBCXX_USE_CXX11_ABI=0" CPPFLAGS=-m32
make src/tools/linux/dump_syms/dump_syms make src/tools/linux/dump_syms/dump_syms
make src/client/linux/libbreakpad_client.a make src/client/linux/libbreakpad_client.a

1
extension/AMBuilder
View File

@ -56,6 +56,7 @@ def BuildEverything():
'linux/crc32.cc', 'linux/crc32.cc',
'linux/dump_symbols.cc', 'linux/dump_symbols.cc',
'linux/elf_symbols_to_module.cc', 'linux/elf_symbols_to_module.cc',
'linux/breakpad_getcontext.S',
]) ])
if AMBuild.target['platform'] in ['linux']: if AMBuild.target['platform'] in ['linux']:

4
extension/extension.cpp
View File

@ -562,12 +562,12 @@ class UploadThread: public IThread
{ {
StderrInhibitor stdrrInhibitor; StderrInhibitor stdrrInhibitor;
if (!WriteSymbolFile(debugFile, debug_dirs, options, outputStream)) { if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", debug_dirs, options, outputStream)) {
outputStream.str(""); outputStream.str("");
outputStream.clear(); outputStream.clear();
// Try again without debug dirs. // Try again without debug dirs.
if (!WriteSymbolFile(debugFile, {}, options, outputStream)) { if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", {}, options, outputStream)) {
if (log) fprintf(log, "Failed to process symbol file\n"); if (log) fprintf(log, "Failed to process symbol file\n");
return false; return false;
} }

1
test/AMBuilder
View File

@ -50,6 +50,7 @@ def BuildEverything():
'linux/crc32.cc', 'linux/crc32.cc',
'linux/dump_symbols.cc', 'linux/dump_symbols.cc',
'linux/elf_symbols_to_module.cc', 'linux/elf_symbols_to_module.cc',
'linux/breakpad_getcontext.S',
]) ])
if AMBuild.target['platform'] in ['linux']: if AMBuild.target['platform'] in ['linux']:

4
test/test.cpp
View File

@ -294,12 +294,12 @@ int main(int argc, char *argv[])
{ {
StderrInhibitor stdrrInhibitor; StderrInhibitor stdrrInhibitor;
if (!WriteSymbolFile(debugFile, debug_dirs, options, outputStream)) { if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", debug_dirs, options, outputStream)) {
outputStream.str(""); outputStream.str("");
outputStream.clear(); outputStream.clear();
// Try again without debug dirs. // Try again without debug dirs.
if (!WriteSymbolFile(debugFile, {}, options, outputStream)) { if (!WriteSymbolFile(debugFileDir, debugFile, "Linux", {}, options, outputStream)) {
// TODO: Something. // TODO: Something.
continue; continue;
} }