commit cfb8d9931bae16fe9239c4befbfed85ab96d4a2f
author Martijn Coenen <maco@google.com> Thu Aug 09 06:32:42 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 09 06:32:42 2018 +0000
tree 7f1359b76ac9a2da471bd87ed9ec70c2f5c1706e
parent a6f756800fbb0e87a2e49cf840bbe97ba3522b50
parent 528ff17dc5e82f9aa2b39da327e2f1fc3aadd591

Merge "libbinder: Don't link against libutilscallstack."

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 6a30956..61b8818 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -119,7 +119,6 @@
         "liblog",
         "libcutils",
         "libutils",
-        "libutilscallstack",
     ],
 
     header_libs: [

libs/binder/IMemory.cpp

diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp
index 7afec45..507ce53 100644
--- a/libs/binder/IMemory.cpp
+++ b/libs/binder/IMemory.cpp
@@ -31,7 +31,6 @@
 #include <binder/Parcel.h>
 #include <log/log.h>
 
-#include <utils/CallStack.h>
 #include <utils/KeyedVector.h>
 #include <utils/threads.h>
 
@@ -264,7 +263,6 @@
                 if (VERBOSE) {
                     ALOGD("UNMAPPING binder=%p, heap=%p, size=%zu, fd=%d",
                             binder.get(), this, mSize, heapId);
-                    CallStack stack(LOG_TAG);
                 }
 
                 munmap(mBase, mSize);

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index c44a17e..4ba6c2a 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -27,7 +27,6 @@
 #include <cutils/properties.h>
 #include <utils/String8.h>
 #include <utils/SystemClock.h>
-#include <utils/CallStack.h>
 
 #include <private/binder/Static.h>