diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 54cace9e2..a2b4cfed5 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -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 \ diff --git a/libbacktrace/BacktraceMap.cpp b/libbacktrace/BacktraceMap.cpp index b0ada46d1..ca47f6781 100644 --- a/libbacktrace/BacktraceMap.cpp +++ b/libbacktrace/BacktraceMap.cpp @@ -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;