The Tor Browser / file comparison
comparison: toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
toolkit/crashreporter/breakpad-patches/11-readsymboldatainternal-proto.patch
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
equal
deleted
inserted
replaced
| -1:000000000000 | 0:4610bcfd0e4a |
|---|---|
| 1 # HG changeset patch | |
| 2 # User Julian Seward <jseward@acm.org> | |
| 3 # Date 1365953823 -7200 | |
| 4 # Node ID 21d2964d1337c0fce7375025610298a818ddbd0f | |
| 5 # Parent ef802a6418f25841880359e6dab3e8240bfd0821 | |
| 6 Bug 861141 - Connect Breakpad on Android to faulty.lib's mmap interface. r=ted. | |
| 7 Adds a prototype for ReadSymbolDataInternal so it can be called from | |
| 8 outside breakpad. | |
| 9 | |
| 10 diff --git src/common/linux/dump_symbols.h | |
| 11 --- a/src/common/linux/dump_symbols.h | |
| 12 +++ b/src/common/linux/dump_symbols.h | |
| 13 @@ -36,16 +36,17 @@ | |
| 14 #define COMMON_LINUX_DUMP_SYMBOLS_H__ | |
| 15 | |
| 16 #include <iostream> | |
| 17 #include <string> | |
| 18 #include <vector> | |
| 19 | |
| 20 #include "common/symbol_data.h" | |
| 21 #include "common/using_std_string.h" | |
| 22 +#include "google_breakpad/common/breakpad_types.h" | |
| 23 | |
| 24 namespace google_breakpad { | |
| 25 | |
| 26 class Module; | |
| 27 | |
| 28 // Find all the debugging information in OBJ_FILE, an ELF executable | |
| 29 // or shared library, and write it to SYM_STREAM in the Breakpad symbol | |
| 30 // file format. | |
| 31 @@ -60,11 +61,19 @@ bool WriteSymbolFile(const string &obj_f | |
| 32 // As above, but simply return the debugging information in MODULE | |
| 33 // instead of writing it to a stream. The caller owns the resulting | |
| 34 // Module object and must delete it when finished. | |
| 35 bool ReadSymbolData(const string& obj_file, | |
| 36 const std::vector<string>& debug_dirs, | |
| 37 SymbolData symbol_data, | |
| 38 Module** module); | |
| 39 | |
| 40 +// Same as ReadSymbolData, except don't try to open the file; instead | |
| 41 +// just use the in-memory data (mapped image of it) located at OBJ_FILE. | |
| 42 +bool ReadSymbolDataInternal(const uint8_t* obj_file, | |
| 43 + const string& obj_filename, | |
| 44 + const std::vector<string>& debug_dirs, | |
| 45 + SymbolData symbol_data, | |
| 46 + Module** module); | |
| 47 + | |
| 48 } // namespace google_breakpad | |
| 49 | |
| 50 #endif // COMMON_LINUX_DUMP_SYMBOLS_H__ |
