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
diff --git a/libutils/Looper.cpp b/libutils/Looper.cpp
index adb0f8d..26e27cf 100644
--- a/libutils/Looper.cpp
+++ b/libutils/Looper.cpp
@@ -13,18 +13,17 @@
// Debugs callback registration and invocation.
#define DEBUG_CALLBACKS 0
-#include <cutils/log.h>
-#include <utils/Looper.h>
-#include <utils/Timers.h>
-
#include <errno.h>
#include <fcntl.h>
-#include <limits.h>
#include <inttypes.h>
+#include <limits.h>
#include <string.h>
#include <sys/eventfd.h>
#include <unistd.h>
+#include <android/log.h>
+#include <utils/Looper.h>
+#include <utils/Timers.h>
namespace android {
diff --git a/libutils/VectorImpl.cpp b/libutils/VectorImpl.cpp
index e8d40ed..893e4f2 100644
--- a/libutils/VectorImpl.cpp
+++ b/libutils/VectorImpl.cpp
@@ -16,16 +16,16 @@
#define LOG_TAG "Vector"
-#include <string.h>
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
-#include <cutils/log.h>
-#include <safe_iop.h>
-
+#include <android/log.h>
#include <utils/Errors.h>
#include <utils/VectorImpl.h>
+#include <safe_iop.h>
+
#include "SharedBuffer.h"
/*****************************************************************************/
diff --git a/libutils/tests/BitSet_test.cpp b/libutils/tests/BitSet_test.cpp
index 59d913e..fbcf025 100644
--- a/libutils/tests/BitSet_test.cpp
+++ b/libutils/tests/BitSet_test.cpp
@@ -16,11 +16,12 @@
#define LOG_TAG "BitSet_test"
-#include <utils/BitSet.h>
-#include <cutils/log.h>
-#include <gtest/gtest.h>
#include <unistd.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+#include <utils/BitSet.h>
+
namespace android {
class BitSet32Test : public testing::Test {
diff --git a/libutils/tests/LruCache_test.cpp b/libutils/tests/LruCache_test.cpp
index de440fd..4e885bb 100644
--- a/libutils/tests/LruCache_test.cpp
+++ b/libutils/tests/LruCache_test.cpp
@@ -15,10 +15,11 @@
*/
#include <stdlib.h>
+
+#include <android/log.h>
+#include <gtest/gtest.h>
#include <utils/JenkinsHash.h>
#include <utils/LruCache.h>
-#include <cutils/log.h>
-#include <gtest/gtest.h>
namespace {
diff --git a/libutils/tests/Vector_test.cpp b/libutils/tests/Vector_test.cpp
index 24ecf86..671200f 100644
--- a/libutils/tests/Vector_test.cpp
+++ b/libutils/tests/Vector_test.cpp
@@ -18,11 +18,12 @@
#define __STDC_LIMIT_MACROS
#include <stdint.h>
-#include <utils/Vector.h>
-#include <cutils/log.h>
-#include <gtest/gtest.h>
#include <unistd.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+#include <utils/Vector.h>
+
namespace android {
class VectorTest : public testing::Test {