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

Commit b7a15500 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes Ie90f7f32,Ie1328b18 

* changes:
  Fix unused argument error on darwin
  Remove libbacktrace dependency on libcutils
parents a763b025 5b439eaf

libbacktrace/Android.mk

+1 −9
Original line number Diff line number Diff line
@@ -51,18 +51,10 @@ libbacktrace_src_files := \ 
	UnwindMap.cpp \

	UnwindPtrace.cpp \



libbacktrace_shared_libraries_target := \

	libcutils \



libbacktrace_shared_libraries := \

	libbase \

	libunwind \



libbacktrace_shared_libraries_host := \

	liblog \



libbacktrace_static_libraries_host := \

	libcutils \

	libunwind \



libbacktrace_ldlibs_host := \

	-lpthread \

libbacktrace/BacktraceMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ bool BacktraceMap::Build() { 
#if defined(__APPLE__)

// Corkscrew and libunwind don't compile on the mac, so create a generic

// map object.

BacktraceMap* BacktraceMap::Create(pid_t pid, bool uncached) {

BacktraceMap* BacktraceMap::Create(pid_t pid, bool /*uncached*/) {

  BacktraceMap* map = new BacktraceMap(pid);

  if (!map->Build()) {

    delete map;