summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-02-10 14:55:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-02-10 14:55:19 +0000
commit38c143e8c00c6a80ef27f8e9ac9db365e4c2b51a (patch)
tree80cad95d73778875013e6774ecf9694033460f0c
parent2d31b4b023ac7e2e3f3336e2cf04c70ccc4398ec (diff)
parentc4cac8f17f3daee5d5290b48f495ffec592c7eaa (diff)
downloadsystem_core-38c143e8c00c6a80ef27f8e9ac9db365e4c2b51a.tar.gz
system_core-38c143e8c00c6a80ef27f8e9ac9db365e4c2b51a.tar.bz2
system_core-38c143e8c00c6a80ef27f8e9ac9db365e4c2b51a.zip
Merge "meminfo: make dmabuf_dump dependency on debugfs optional"
-rw-r--r--libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
index 5ee9c3d17..0851fb33c 100644
--- a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
+++ b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
@@ -150,8 +150,8 @@ int main(int argc, char* argv[]) {
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) {