diff options
| author | 2016-12-28 17:11:38 +0000 | |
|---|---|---|
| committer | 2016-12-28 17:11:38 +0000 | |
| commit | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (patch) | |
| tree | 73123bf4e82507ca08ec638cba67c909a1535d1c /cmds/dumpstate/utils.cpp | |
| parent | 20bfa17b2a4bfb76f54aeb9301296d0f19ad1f3c (diff) | |
| parent | 430f62090cefe4630794873e30390433ad3e49a7 (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6 am: 7e92307cd8
am: 430f62090c
Change-Id: I8bbed9204718da324f0bdeceb7b8156cb315e900
Diffstat (limited to 'cmds/dumpstate/utils.cpp')
| -rw-r--r-- | cmds/dumpstate/utils.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp index 285c01ef8a..22394b9fed 100644 --- a/cmds/dumpstate/utils.cpp +++ b/cmds/dumpstate/utils.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#define LOG_TAG "dumpstate" + #include <dirent.h> #include <errno.h> #include <fcntl.h> @@ -23,24 +25,23 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#include <string> #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 <sys/klog.h> #include <time.h> #include <unistd.h> -#include <vector> -#include <sys/prctl.h> -#define LOG_TAG "dumpstate" +#include <string> +#include <vector> +#include <android/log.h> #include <android-base/file.h> #include <cutils/debugger.h> -#include <cutils/log.h> #include <cutils/properties.h> #include <cutils/sockets.h> #include <private/android_filesystem_config.h> |