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/include/utils/KeyedVector.h b/include/utils/KeyedVector.h
index 92579e2..42de401 100644
--- a/include/utils/KeyedVector.h
+++ b/include/utils/KeyedVector.h
@@ -21,11 +21,10 @@
#include <stdint.h>
#include <sys/types.h>
-#include <cutils/log.h>
-
+#include <android/log.h>
+#include <utils/Errors.h>
#include <utils/SortedVector.h>
#include <utils/TypeHelpers.h>
-#include <utils/Errors.h>
// ---------------------------------------------------------------------------
diff --git a/include/utils/Log.h b/include/utils/Log.h
index 4259c86..6ef3fa3 100644
--- a/include/utils/Log.h
+++ b/include/utils/Log.h
@@ -28,9 +28,10 @@
#ifndef _LIBS_UTILS_LOG_H
#define _LIBS_UTILS_LOG_H
-#include <cutils/log.h>
#include <sys/types.h>
+#include <android/log.h>
+
#ifdef __cplusplus
namespace android {
diff --git a/include/utils/SortedVector.h b/include/utils/SortedVector.h
index ea0f82c..9f2ec02 100644
--- a/include/utils/SortedVector.h
+++ b/include/utils/SortedVector.h
@@ -21,11 +21,10 @@
#include <stdint.h>
#include <sys/types.h>
-#include <cutils/log.h>
-
+#include <android/log.h>
+#include <utils/TypeHelpers.h>
#include <utils/Vector.h>
#include <utils/VectorImpl.h>
-#include <utils/TypeHelpers.h>
// ---------------------------------------------------------------------------
diff --git a/include/utils/Vector.h b/include/utils/Vector.h
index b6d5686..6c1931e 100644
--- a/include/utils/Vector.h
+++ b/include/utils/Vector.h
@@ -17,14 +17,14 @@
#ifndef ANDROID_VECTOR_H
#define ANDROID_VECTOR_H
-#include <new>
#include <stdint.h>
#include <sys/types.h>
-#include <cutils/log.h>
+#include <new>
-#include <utils/VectorImpl.h>
+#include <android/log.h>
#include <utils/TypeHelpers.h>
+#include <utils/VectorImpl.h>
// ---------------------------------------------------------------------------