diff options
| author | 2016-12-28 09:28:53 -0800 | |
|---|---|---|
| committer | 2016-12-28 09:29:20 -0800 | |
| commit | c03d283e8b3f830d76dd94822b2a13872c05c730 (patch) | |
| tree | 514c1b1518ea1b3b863856857ad1cd79b88d00f1 /cmds/dumpstate/utils.cpp | |
| parent | f38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4 (diff) | |
| parent | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (diff) | |
resolve merge conflicts of 525a5f2 to master
Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
Diffstat (limited to 'cmds/dumpstate/utils.cpp')
| -rw-r--r-- | cmds/dumpstate/utils.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp index ee887058ba..0f50fc9ed2 100644 --- a/cmds/dumpstate/utils.cpp +++ b/cmds/dumpstate/utils.cpp @@ -23,9 +23,25 @@ #include <libgen.h> #include <math.h> #include <poll.h> +#include <signal.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/capability.h> #include <sys/inotify.h> #include <sys/klog.h> +#include <sys/prctl.h> +#include <sys/stat.h> +#include <sys/time.h> +#include <sys/wait.h> +#include <time.h> +#include <unistd.h> +#include <string> +#include <vector> + +#include <android/log.h> #include <android-base/file.h> #include <android-base/properties.h> #include <android-base/stringprintf.h> |