summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2016-09-28 17:54:45 -0500
committerMark Salyzyn2016-09-30 14:47:05 -0500
commitff2dcd9af994a23ed483939a416b48bdc10eefd5 (patch)
tree6e5a0dfe4e39c407eea7e39840eef5d56b720de4 /libdiskconfig
parent66ce3e08c5632a20ea66bde6dd76397041edf034 (diff)
downloadplatform-system-core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.tar.gz
platform-system-core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.tar.xz
platform-system-core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.zip
system/core Replace log/log.h with android/log.h
Should use android/log.h instead of log/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: I33a8fb4e754d2dc4754d335660c450e0a67190fc
Diffstat (limited to 'libdiskconfig')
-rw-r--r--libdiskconfig/diskconfig.c8
-rw-r--r--libdiskconfig/diskutils.c4
2 files changed, 5 insertions, 7 deletions
diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c
index 1167d4b5e..2d59ad996 100644
--- a/libdiskconfig/diskconfig.c
+++ b/libdiskconfig/diskconfig.c
@@ -20,21 +20,19 @@
20#include <errno.h> 20#include <errno.h>
21#include <fcntl.h> 21#include <fcntl.h>
22#include <inttypes.h> 22#include <inttypes.h>
23#include <linux/fs.h>
23#include <stdio.h> 24#include <stdio.h>
24#include <stdlib.h> 25#include <stdlib.h>
25#include <string.h> 26#include <string.h>
26#include <unistd.h>
27#include <sys/ioctl.h> 27#include <sys/ioctl.h>
28#include <sys/stat.h> 28#include <sys/stat.h>
29#include <unistd.h>
29 30
30#include <linux/fs.h> 31#include <android/log.h>
31
32#include <cutils/config_utils.h> 32#include <cutils/config_utils.h>
33#include <log/log.h>
34 33
35#include <diskconfig/diskconfig.h> 34#include <diskconfig/diskconfig.h>
36 35
37
38static int 36static int
39parse_len(const char *str, uint64_t *plen) 37parse_len(const char *str, uint64_t *plen)
40{ 38{
diff --git a/libdiskconfig/diskutils.c b/libdiskconfig/diskutils.c
index 5d0ee6267..3a2760155 100644
--- a/libdiskconfig/diskutils.c
+++ b/libdiskconfig/diskutils.c
@@ -23,10 +23,10 @@
23#include <stdio.h> 23#include <stdio.h>
24#include <stdlib.h> 24#include <stdlib.h>
25#include <string.h> 25#include <string.h>
26#include <unistd.h>
27#include <sys/stat.h> 26#include <sys/stat.h>
27#include <unistd.h>
28 28
29#include <log/log.h> 29#include <android/log.h>
30 30
31#include <diskconfig/diskconfig.h> 31#include <diskconfig/diskconfig.h>
32 32