From 3d66aa307eed9ed622a70df0814e6c398bac40f9 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Thu, 29 Sep 2016 10:50:27 -0700
Subject: system/extras: Replace cutils/log.h with android/log.h or log/log.h

Test: build success
Bug: 26552300
Bug: 31289077
Change-Id: I245c859eae366f817f883e74717bb04050196b4e
---
 memtrack/memtrack.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'memtrack')

diff --git a/memtrack/memtrack.cpp b/memtrack/memtrack.cpp
index 2c4d7c08..f14e06d4 100644
--- a/memtrack/memtrack.cpp
+++ b/memtrack/memtrack.cpp
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#define LOG_TAG "MemTracker"
 
 #include "memtrack.h"
 
@@ -27,15 +28,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <cutils/log.h>
-
 #include <algorithm>
 #include <vector>
 
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif
-#define LOG_TAG "MemTracker"
+#include <android/log.h>
 
 FileData::FileData(char *filename, char *buffer, size_t buffer_len)
     : data_(buffer), max_(buffer_len), cur_idx_(0), len_(0),
-- 
cgit v1.2.3