commit d127ef8de8cffc1b2db3bad972ad9b016811655b
author Colin Cross <ccross@android.com> Fri Feb 08 01:36:50 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Feb 08 01:36:50 2019 -0800
tree 299c0827b00a032bc21581cd2757c8e6ff47b754
parent 76d69f8b726abc420b0583b8cae0c2b818aa22e2
parent 5619dbb422bdc2d52f447ce9e23808fa16b4cc36

Merge "Fix 32-bit dmabuf_dump build" am: 2dcb4160fa am: f2ec660d23
am: a06f9d2a62

Change-Id: Iac8ca23ffbc220492ca82e16d8b7219aa6b6e071

libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp

diff --git a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
index 223c001..5ee9c3d 100644
--- a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
+++ b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
@@ -105,7 +105,7 @@
 
     for (auto buf = bufs.begin(); buf != bufs.end(); ++buf) {
 
-        std::cout << ::android::base::StringPrintf("%16lu\t%10" PRIu64 "\t%lu\t",
+        std::cout << ::android::base::StringPrintf("%16lu\t%10" PRIu64 "\t%" PRIu64 "\t",
             buf->inode(),buf->size(), buf->count());
 
         memset(fds.get(), 0, sizeof(int) * pid_count);