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
diff --git a/base/logging.cpp b/base/logging.cpp
index eaed9ab..ece10ec 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -43,18 +43,18 @@
#include <utility>
#include <vector>
-#include "android-base/macros.h"
-#include "android-base/strings.h"
-
// Headers for LogMessage::LogLine.
#ifdef __ANDROID__
+#include <android/log.h>
#include <android/set_abort_message.h>
-#include "log/log.h"
#else
#include <sys/types.h>
#include <unistd.h>
#endif
+#include <android-base/macros.h>
+#include <android-base/strings.h>
+
// For gettid.
#if defined(__APPLE__)
#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED