diff options
author | Mark Salyzyn <salyzyn@google.com> | 2016-09-28 15:54:45 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 12:47:05 -0700 |
commit | ff2dcd9af994a23ed483939a416b48bdc10eefd5 (patch) | |
tree | 6e5a0dfe4e39c407eea7e39840eef5d56b720de4 /base/logging.cpp | |
parent | 66ce3e08c5632a20ea66bde6dd76397041edf034 (diff) | |
download | system_core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.tar.gz system_core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.tar.bz2 system_core-ff2dcd9af994a23ed483939a416b48bdc10eefd5.zip |
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
Diffstat (limited to 'base/logging.cpp')
-rw-r--r-- | base/logging.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/logging.cpp b/base/logging.cpp index eaed9abe1..ece10ecdd 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 |