diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-09-28 15:54:45 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 12:47:05 -0700 |
| commit | ff2dcd9af994a23ed483939a416b48bdc10eefd5 (patch) | |
| tree | 6e5a0dfe4e39c407eea7e39840eef5d56b720de4 /libdiskconfig | |
| parent | 66ce3e08c5632a20ea66bde6dd76397041edf034 (diff) | |
| download | system_core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.tar.gz system_core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.tar.bz2 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.c | 8 | ||||
| -rw-r--r-- | libdiskconfig/diskutils.c | 4 |
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 @@ #include <errno.h> #include <fcntl.h> #include <inttypes.h> +#include <linux/fs.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <sys/ioctl.h> #include <sys/stat.h> +#include <unistd.h> -#include <linux/fs.h> - +#include <android/log.h> #include <cutils/config_utils.h> -#include <log/log.h> #include <diskconfig/diskconfig.h> - static int parse_len(const char *str, uint64_t *plen) { 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 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <sys/stat.h> +#include <unistd.h> -#include <log/log.h> +#include <android/log.h> #include <diskconfig/diskconfig.h> |