am 936a236b: Merge "Add uncached argument to BacktraceMap::Create on darwin"

* commit '936a236b9e00100c915cce7e2fea8f553f491c7e':
  Add uncached argument to BacktraceMap::Create on darwin
This commit is contained in:
Brian Carlstrom 2014-08-05 07:22:57 +00:00 committed by Android Git Automerger
commit 2ea89b631d

View file

@ -137,7 +137,7 @@ bool BacktraceMap::Build() {
#if defined(__APPLE__) #if defined(__APPLE__)
// Corkscrew and libunwind don't compile on the mac, so create a generic // Corkscrew and libunwind don't compile on the mac, so create a generic
// map object. // map object.
BacktraceMap* BacktraceMap::Create(pid_t pid) { BacktraceMap* BacktraceMap::Create(pid_t pid, bool uncached) {
BacktraceMap* map = new BacktraceMap(pid); BacktraceMap* map = new BacktraceMap(pid);
if (!map->Build()) { if (!map->Build()) {
delete map; delete map;