commit 8428603f5dac95ebdd0e166b58639c1d51ab6426
author Mark Salyzyn <salyzyn@google.com> Mon Oct 03 22:31:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 03 22:31:12 2016 +0000
tree b5b0a50f1c50a0591580d9d5329474659ae41177
parent 9f22fc1a6f9fba9a423dc76316df6ad4ee6d6ccf
parent b5517abca2dc8bbc49a4bebeb618c7c657ba8cd7

Merge "libbcc: Replace cutils/log.h with android/log.h"

bcinfo/BitcodeTranslator.cpp

diff --git a/bcinfo/BitcodeTranslator.cpp b/bcinfo/BitcodeTranslator.cpp
index 3621c82..8105e51 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 <cutils/log.h>
+#include <android/log.h>
 
 #include "llvm/Bitcode/BitstreamWriter.h"
 #include "llvm/Bitcode/ReaderWriter.h"

bcinfo/BitcodeWrapper.cpp

diff --git a/bcinfo/BitcodeWrapper.cpp b/bcinfo/BitcodeWrapper.cpp
index 1258067..43a464c 100644
--- a/bcinfo/BitcodeWrapper.cpp
+++ b/bcinfo/BitcodeWrapper.cpp
@@ -19,7 +19,7 @@
 #include "bcinfo/Wrap/in_memory_wrapper_input.h"
 
 #define LOG_TAG "bcinfo"
-#include <cutils/log.h>
+#include <android/log.h>
 
 #include "llvm/Bitcode/ReaderWriter.h"
 

bcinfo/MetadataExtractor.cpp

diff --git a/bcinfo/MetadataExtractor.cpp b/bcinfo/MetadataExtractor.cpp
index 48a2ecb..b78c049 100644
--- a/bcinfo/MetadataExtractor.cpp
+++ b/bcinfo/MetadataExtractor.cpp
@@ -20,7 +20,7 @@
 #include "rsDefines.h"
 
 #define LOG_TAG "bcinfo"
-#include <cutils/log.h>
+#include <android/log.h>
 #ifdef __ANDROID__
 #include <cutils/properties.h>
 #endif

bcinfo/Wrap/bitcode_wrapperer.cpp

diff --git a/bcinfo/Wrap/bitcode_wrapperer.cpp b/bcinfo/Wrap/bitcode_wrapperer.cpp
index 0a49497..365801a 100644
--- a/bcinfo/Wrap/bitcode_wrapperer.cpp
+++ b/bcinfo/Wrap/bitcode_wrapperer.cpp
@@ -17,7 +17,7 @@
 #include "bcinfo/Wrap/bitcode_wrapperer.h"
 
 #define LOG_TAG "bcinfo"
-#include <cutils/log.h>
+#include <android/log.h>
 
 #include <stdio.h>
 #include <sys/stat.h>

include/bcc/Assert.h

diff --git a/include/bcc/Assert.h b/include/bcc/Assert.h
index e87ba42..75c2aec 100644
--- a/include/bcc/Assert.h
+++ b/include/bcc/Assert.h
@@ -32,7 +32,7 @@
 #else
 
 #define LOG_TAG "bcc"
-#include <cutils/log.h>
+#include <android/log.h>
 
 #define __ABORT_ON_FAILURES 1
 

include/bcc/Support/Log.h

diff --git a/include/bcc/Support/Log.h b/include/bcc/Support/Log.h
index f4079ef..d22b2a7 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 <cutils/log.h>
+#   include <android/log.h>
 #endif
 
 #endif // BCC_SUPPORT_LOG_H