commit b26590b06abe1e7fe509e2728422c68c583c4adb
author Erick Reyes <erickreyes@google.com> Sun Feb 10 08:24:19 2019 -0800
committer android-build-merger <android-build-merger@google.com> Sun Feb 10 08:24:19 2019 -0800
tree 1d0fcb80644a7af7ffa4a31a436f29d4fdaf3455
parent 3af4d973d6fb9a8b5e07c2c95b9277af15fbc962
parent c8b8a43dbcb1cd670ff44cce522b70b8e98dcff1

Merge "meminfo: make dmabuf_dump dependency on debugfs optional" am: 38c143e8c0 am: b49ddbc5c1
am: 00b5fd5c88

Change-Id: If97ada7f05b0b841759f2d4994dfc503cf3d4130

libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp

diff --git a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
index 5ee9c3d..0851fb3 100644
--- a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
+++ b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
@@ -150,8 +150,8 @@
 
     if (show_all) {
         if (!ReadDmaBufInfo(&bufs)) {
-            std::cerr << "Unable to read DEBUGFS dmabuf info" << std::endl;
-            exit(EXIT_FAILURE);
+            std::cerr << "debugfs entry for dmabuf not available, skipping" << std::endl;
+            bufs.clear();
         }
         std::unique_ptr<DIR, int (*)(DIR*)> dir(opendir("/proc"), closedir);
         if (!dir) {