michael@0: # HG changeset patch
michael@0: # User Julian Seward <jseward@acm.org>
michael@0: # Date 1365953823 -7200
michael@0: # Node ID 21d2964d1337c0fce7375025610298a818ddbd0f
michael@0: # Parent  ef802a6418f25841880359e6dab3e8240bfd0821
michael@0: Bug 861141 - Connect Breakpad on Android to faulty.lib's mmap interface.  r=ted.
michael@0: Adds a prototype for ReadSymbolDataInternal so it can be called from
michael@0: outside breakpad.
michael@0: 
michael@0: diff --git src/common/linux/dump_symbols.h
michael@0: --- a/src/common/linux/dump_symbols.h
michael@0: +++ b/src/common/linux/dump_symbols.h
michael@0: @@ -36,16 +36,17 @@
michael@0:  #define COMMON_LINUX_DUMP_SYMBOLS_H__
michael@0:  
michael@0:  #include <iostream>
michael@0:  #include <string>
michael@0:  #include <vector>
michael@0:  
michael@0:  #include "common/symbol_data.h"
michael@0:  #include "common/using_std_string.h"
michael@0: +#include "google_breakpad/common/breakpad_types.h"
michael@0:  
michael@0:  namespace google_breakpad {
michael@0:  
michael@0:  class Module;
michael@0:  
michael@0:  // Find all the debugging information in OBJ_FILE, an ELF executable
michael@0:  // or shared library, and write it to SYM_STREAM in the Breakpad symbol
michael@0:  // file format.
michael@0: @@ -60,11 +61,19 @@ bool WriteSymbolFile(const string &obj_f
michael@0:  // As above, but simply return the debugging information in MODULE
michael@0:  // instead of writing it to a stream. The caller owns the resulting
michael@0:  // Module object and must delete it when finished.
michael@0:  bool ReadSymbolData(const string& obj_file,
michael@0:                      const std::vector<string>& debug_dirs,
michael@0:                      SymbolData symbol_data,
michael@0:                      Module** module);
michael@0:  
michael@0: +// Same as ReadSymbolData, except don't try to open the file; instead
michael@0: +// just use the in-memory data (mapped image of it) located at OBJ_FILE.
michael@0: +bool ReadSymbolDataInternal(const uint8_t* obj_file,
michael@0: +                            const string& obj_filename,
michael@0: +                            const std::vector<string>& debug_dirs,
michael@0: +                            SymbolData symbol_data,
michael@0: +                            Module** module);
michael@0: +
michael@0:  }  // namespace google_breakpad
michael@0:  
michael@0:  #endif  // COMMON_LINUX_DUMP_SYMBOLS_H__