summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2016-09-28 12:07:20 -0500
committerMark Salyzyn2016-09-30 14:47:05 -0500
commit66ce3e08c5632a20ea66bde6dd76397041edf034 (patch)
treee77589e0f6c62e8ac1c8faabe2d9dd2934d3ecee /libdiskconfig
parent0dd4431072cce3c62876b728cb20aa5b77b11a8d (diff)
downloadplatform-system-core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.gz
platform-system-core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.xz
platform-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 @@
16 */ 16 */
17 17
18#define LOG_TAG "config_mbr" 18#define LOG_TAG "config_mbr"
19
19#include <stdint.h> 20#include <stdint.h>
21#include <stdio.h>
20#include <stdlib.h> 22#include <stdlib.h>
21#include <string.h> 23#include <string.h>
22#include <stdio.h>
23
24#include <cutils/log.h>
25 24
25#include <android/log.h>
26#include <diskconfig/diskconfig.h> 26#include <diskconfig/diskconfig.h>
27 27
28
29/* start and len are in LBA units */ 28/* start and len are in LBA units */
30static void 29static void
31cfg_pentry(struct pc_partition *pentry, uint8_t status, uint8_t type, 30cfg_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 @@
16 */ 16 */
17 17
18#define LOG_TAG "dump_diskconfig" 18#define LOG_TAG "dump_diskconfig"
19
19#include <stdio.h> 20#include <stdio.h>
20 21
21#include <cutils/log.h> 22#include <android/log.h>
22 23
23#include "diskconfig.h" 24#include "diskconfig.h"
24 25
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 @@
16 */ 16 */
17 17
18#define LOG_TAG "write_lst" 18#define LOG_TAG "write_lst"
19#include <sys/types.h> 19
20#include <stdint.h> 20#include <stdint.h>
21#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h> 22#include <stdlib.h>
23#include <sys/types.h>
23#include <unistd.h> 24#include <unistd.h>
24 25
25#include <cutils/log.h> 26#include <android/log.h>
26
27#include <diskconfig/diskconfig.h> 27#include <diskconfig/diskconfig.h>
28 28
29struct write_list * 29struct write_list *