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/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc
index ecfd719..9f9c83f 100644
--- a/libnativebridge/native_bridge.cc
+++ b/libnativebridge/native_bridge.cc
@@ -16,8 +16,6 @@
#include "nativebridge/native_bridge.h"
-#include <cstring>
-#include <cutils/log.h>
#include <dlfcn.h>
#include <errno.h>
#include <fcntl.h>
@@ -25,6 +23,9 @@
#include <sys/mount.h>
#include <sys/stat.h>
+#include <cstring>
+
+#include <android/log.h>
namespace android {
diff --git a/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp b/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp
index 69c30a1..5a2b0a1 100644
--- a/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp
+++ b/libnativebridge/tests/PreInitializeNativeBridgeFail1_test.cpp
@@ -16,9 +16,6 @@
#include "NativeBridgeTest.h"
-#include <cstdio>
-#include <cstring>
-#include <cutils/log.h>
#include <dlfcn.h>
#include <errno.h>
#include <fcntl.h>
@@ -26,6 +23,11 @@
#include <sys/mount.h>
#include <sys/stat.h>
+#include <cstdio>
+#include <cstring>
+
+#include <android/log.h>
+
namespace android {
TEST_F(NativeBridgeTest, PreInitializeNativeBridgeFail1) {
diff --git a/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp b/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp
index 74e96e0..af976b1 100644
--- a/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp
+++ b/libnativebridge/tests/PreInitializeNativeBridgeFail2_test.cpp
@@ -14,11 +14,6 @@
* limitations under the License.
*/
-#include "NativeBridgeTest.h"
-
-#include <cstdio>
-#include <cstring>
-#include <cutils/log.h>
#include <dlfcn.h>
#include <errno.h>
#include <fcntl.h>
@@ -26,6 +21,13 @@
#include <sys/mount.h>
#include <sys/stat.h>
+#include <cstdio>
+#include <cstring>
+
+#include <android/log.h>
+
+#include "NativeBridgeTest.h"
+
namespace android {
TEST_F(NativeBridgeTest, PreInitializeNativeBridgeFail2) {
diff --git a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp
index d3bbebe..f3e5f38 100644
--- a/libnativebridge/tests/PreInitializeNativeBridge_test.cpp
+++ b/libnativebridge/tests/PreInitializeNativeBridge_test.cpp
@@ -14,11 +14,6 @@
* limitations under the License.
*/
-#include "NativeBridgeTest.h"
-
-#include <cstdio>
-#include <cstring>
-#include <cutils/log.h>
#include <dlfcn.h>
#include <errno.h>
#include <fcntl.h>
@@ -26,6 +21,13 @@
#include <sys/mount.h>
#include <sys/stat.h>
+#include <cstdio>
+#include <cstring>
+
+#include <android/log.h>
+
+#include "NativeBridgeTest.h"
+
namespace android {
static constexpr const char* kTestData = "PreInitializeNativeBridge test.";