Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3336c7bc authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Remove include of backtrace/Backtrace.h. 

Somehow the code was still including this include from libbacktrace.
I think the libbacktrace include directory was coming from some
transitive includes. I verified that nothing in debuggerd is using
the libbacktace.so shared library.

Bug: 120606663

Test: Builds, unit tests pass.
Change-Id: I85c2837c5a539ccefc5a7140949988058d21697a
parent f4ccb804

debuggerd/libdebuggerd/include/libdebuggerd/utility.h

+9 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef _DEBUGGERD_UTILITY_H

#define _DEBUGGERD_UTILITY_H



#include <inttypes.h>

#include <signal.h>

#include <stdbool.h>

#include <sys/types.h>
@@ -25,7 +26,6 @@ 
#include <string>



#include <android-base/macros.h>

#include <backtrace/Backtrace.h>



struct log_t {

  // Tombstone file descriptor.
@@ -61,6 +61,14 @@ enum logtype { 
  OPEN_FILES

};



#if defined(__LP64__)

#define PRIPTR "016" PRIx64

typedef uint64_t word_t;

#else

#define PRIPTR "08" PRIx64

typedef uint32_t word_t;

#endif



// Log information onto the tombstone.

void _LOG(log_t* log, logtype ltype, const char* fmt, ...) __attribute__((format(printf, 3, 4)));

debuggerd/libdebuggerd/test/tombstone_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <stdlib.h>

#include <sys/mman.h>

#include <time.h>



#include <memory>

debuggerd/libdebuggerd/tombstone.cpp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/mman.h>

#include <sys/ptrace.h>

#include <sys/stat.h>

#include <time.h>

debuggerd/libdebuggerd/utility.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <backtrace/Backtrace.h>

#include <debuggerd/handler.h>

#include <log/log.h>

#include <unwindstack/Memory.h>