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

Commit 97790cfd authored by Yabin Cui's avatar Yabin Cui Committed by android-build-merger
Browse files

Merge "Fix libbacktrace host build." 

am: bfdc0996

* commit 'bfdc0996':
  Fix libbacktrace host build.
parents 4542b62c bfdc0996

libbacktrace/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ libbacktrace_shared_libraries_target := \ 
# Use static llvm libraries on host to remove dependency on 32-bit llvm shared library

# which is not included in the prebuilt.

libbacktrace_static_libraries_host := \

	libcutils \

	libLLVMObject \

	libLLVMBitReader \

	libLLVMMC \

libbacktrace/Backtrace.cpp

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <backtrace/Backtrace.h>

#include <backtrace/BacktraceMap.h>



#include <cutils/threads.h>



#include "BacktraceLog.h"

#include "BacktraceOffline.h"

#include "thread_utils.h"

libbacktrace/BacktraceCurrent.cpp

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <backtrace/Backtrace.h>

#include <backtrace/BacktraceMap.h>



#include <cutils/threads.h>



#include "BacktraceCurrent.h"

#include "BacktraceLog.h"

#include "ThreadEntry.h"

libbacktrace/thread_utils.h

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 


#include <unistd.h>



#if !defined(__ANDROID__)

#include <cutils/threads.h>

#endif



__BEGIN_DECLS



int tgkill(int tgid, int tid, int sig);