summaryrefslogtreecommitdiffstats
path: root/libdiskconfig
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-09-28 10:07:20 -0700
committerMark Salyzyn <salyzyn@google.com>2016-09-30 12:47:05 -0700
commit66ce3e08c5632a20ea66bde6dd76397041edf034 (patch)
treee77589e0f6c62e8ac1c8faabe2d9dd2934d3ecee /libdiskconfig
parent0dd4431072cce3c62876b728cb20aa5b77b11a8d (diff)
downloadsystem_core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.gz
system_core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.bz2
system_core-66ce3e08c5632a20ea66bde6dd76397041edf034.zip
system/core Replace cutils/log.h with android/log.h
Should use android/log.h instead of cutils/log.h as a good example to all others. Adjust header order to comply with Android Coding standards. Test: Compile Bug: 26552300 Bug: 31289077 Change-Id: I2c9cbbbd64d8dccf2d44356361d9742e4a9b9031
Diffstat (limited to 'libdiskconfig')
-rw-r--r--libdiskconfig/config_mbr.c7
-rw-r--r--libdiskconfig/dump_diskconfig.c3
-rw-r--r--libdiskconfig/write_lst.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c
index 7b6ca1c65..1d3cd200a 100644
--- a/libdiskconfig/config_mbr.c
+++ b/libdiskconfig/config_mbr.c
@@ -16,16 +16,15 @@
*/
#define LOG_TAG "config_mbr"
+
#include <stdint.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
-
-#include <cutils/log.h>
+#include <android/log.h>
#include <diskconfig/diskconfig.h>
-
/* start and len are in LBA units */
static void
cfg_pentry(struct pc_partition *pentry, uint8_t status, uint8_t type,
diff --git a/libdiskconfig/dump_diskconfig.c b/libdiskconfig/dump_diskconfig.c
index 75256f616..c94e7f49e 100644
--- a/libdiskconfig/dump_diskconfig.c
+++ b/libdiskconfig/dump_diskconfig.c
@@ -16,9 +16,10 @@
*/
#define LOG_TAG "dump_diskconfig"
+
#include <stdio.h>
-#include <cutils/log.h>
+#include <android/log.h>
#include "diskconfig.h"
diff --git a/libdiskconfig/write_lst.c b/libdiskconfig/write_lst.c
index 90b1c829a..21d4a3108 100644
--- a/libdiskconfig/write_lst.c
+++ b/libdiskconfig/write_lst.c
@@ -16,14 +16,14 @@
*/
#define LOG_TAG "write_lst"
-#include <sys/types.h>
+
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
#include <unistd.h>
-#include <cutils/log.h>
-
+#include <android/log.h>
#include <diskconfig/diskconfig.h>
struct write_list *