Merge "liblog: use log/log.h when utilizing ALOG macros"
diff --git a/bcinfo/BitcodeTranslator.cpp b/bcinfo/BitcodeTranslator.cpp
index 8105e51..5335eba 100644
--- a/bcinfo/BitcodeTranslator.cpp
+++ b/bcinfo/BitcodeTranslator.cpp
@@ -24,7 +24,7 @@
#include "BitWriter_3_2/ReaderWriter_3_2.h"
#define LOG_TAG "bcinfo"
-#include <android/log.h>
+#include <log/log.h>
#include "llvm/Bitcode/BitstreamWriter.h"
#include "llvm/Bitcode/ReaderWriter.h"
diff --git a/bcinfo/MetadataExtractor.cpp b/bcinfo/MetadataExtractor.cpp
index b08940f..fbcd883 100644
--- a/bcinfo/MetadataExtractor.cpp
+++ b/bcinfo/MetadataExtractor.cpp
@@ -20,7 +20,7 @@
#include "rsDefines.h"
#define LOG_TAG "bcinfo"
-#include <android/log.h>
+#include <log/log.h>
#ifdef __ANDROID__
#include <cutils/properties.h>
#endif
diff --git a/bcinfo/Wrap/bitcode_wrapperer.cpp b/bcinfo/Wrap/bitcode_wrapperer.cpp
index 365801a..d506cbe 100644
--- a/bcinfo/Wrap/bitcode_wrapperer.cpp
+++ b/bcinfo/Wrap/bitcode_wrapperer.cpp
@@ -17,11 +17,12 @@
#include "bcinfo/Wrap/bitcode_wrapperer.h"
#define LOG_TAG "bcinfo"
-#include <android/log.h>
#include <stdio.h>
#include <sys/stat.h>
+#include <log/log.h>
+
using std::vector;
// The number of bytes in a 32 bit integer.
diff --git a/include/bcc/Support/Log.h b/include/bcc/Support/Log.h
index d22b2a7..80f814e 100644
--- a/include/bcc/Support/Log.h
+++ b/include/bcc/Support/Log.h
@@ -19,7 +19,7 @@
#ifndef LOG_TAG
# define LOG_TAG "bcc"
-# include <android/log.h>
+# include <log/log.h>
#endif
#endif // BCC_SUPPORT_LOG_H
diff --git a/tools/bcc/Main.cpp b/tools/bcc/Main.cpp
index 1181e43..c0f1210 100644
--- a/tools/bcc/Main.cpp
+++ b/tools/bcc/Main.cpp
@@ -24,6 +24,8 @@
#include <dlfcn.h>
#include <stdlib.h>
+#include <log/log.h>
+
#include <llvm/ADT/STLExtras.h>
#include <llvm/ADT/SmallString.h>
#include <llvm/Config/config.h>
