diff options
| author | 2016-12-28 17:04:37 +0000 | |
|---|---|---|
| committer | 2016-12-28 17:04:37 +0000 | |
| commit | 430f62090cefe4630794873e30390433ad3e49a7 (patch) | |
| tree | 7be4e24bedf448832cad98fdd6f9df16e7af41eb /cmds/dumpstate/utils.cpp | |
| parent | 672886dfdd7051f66b251a8982e0657aa859baf9 (diff) | |
| parent | 7e92307cd8d5c22daeeae7cb6ab5943be0226e7a (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6
am: 7e92307cd8
Change-Id: I1523bfc0794fe8463fb6134ae8d8c5902947de8b
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 8704d3d7e7..87e6770643 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> |