diff options
| author | 2017-01-11 15:45:46 +0000 | |
|---|---|---|
| committer | 2017-01-11 15:45:46 +0000 | |
| commit | 082a1721b5165420e11319b98eefaa35d0feb844 (patch) | |
| tree | bc3c1b7e76fb41a950cd988903496e761b5c1d66 /libs/androidfw/BackupHelpers.cpp | |
| parent | 46c39f6c3640dabc3e5eb5d37460f0b3d0622da6 (diff) | |
| parent | ef8ccc8510d2c66c4807f15962c3d53235af5fc5 (diff) | |
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
am: ef8ccc8510
Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
Diffstat (limited to 'libs/androidfw/BackupHelpers.cpp')
| -rw-r--r-- | libs/androidfw/BackupHelpers.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libs/androidfw/BackupHelpers.cpp b/libs/androidfw/BackupHelpers.cpp index 78e9d91c4d67..8bfe2b6a259a 100644 --- a/libs/androidfw/BackupHelpers.cpp +++ b/libs/androidfw/BackupHelpers.cpp @@ -18,23 +18,22 @@ #include <androidfw/BackupHelpers.h> -#include <utils/KeyedVector.h> -#include <utils/ByteOrder.h> -#include <utils/String8.h> - #include <errno.h> -#include <sys/types.h> -#include <sys/uio.h> -#include <sys/stat.h> -#include <sys/time.h> // for utimes +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/time.h> // for utimes +#include <sys/uio.h> #include <unistd.h> #include <utime.h> -#include <fcntl.h> #include <zlib.h> -#include <cutils/log.h> +#include <log/log.h> +#include <utils/ByteOrder.h> +#include <utils/KeyedVector.h> +#include <utils/String8.h> namespace android { |