From 707bbae8ffe73ecc96a1937113ed596de6633d56 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Mon, 9 Jan 2017 13:33:48 -0800
Subject: [PATCH] minikin: use log/log.h when utilizing ALOG macros

Use log/log.h to harden code against liblog changes.

Test: compile
Bug: 30465923
Change-Id: I3dea82e76d28d9ef52d7c0f11e038c4298863eb9
---
 engine/src/flutter/libs/minikin/FontCollection.cpp        | 2 +-
 engine/src/flutter/libs/minikin/FontFamily.cpp            | 2 +-
 engine/src/flutter/libs/minikin/FontLanguageListCache.cpp | 2 +-
 engine/src/flutter/libs/minikin/HbFontCache.cpp           | 2 +-
 engine/src/flutter/libs/minikin/Layout.cpp                | 2 +-
 engine/src/flutter/libs/minikin/LineBreaker.cpp           | 2 +-
 engine/src/flutter/libs/minikin/MinikinInternal.cpp       | 2 +-
 engine/src/flutter/libs/minikin/SparseBitSet.cpp          | 2 +-
 engine/src/flutter/tests/FontTestUtils.cpp                | 2 +-
 engine/src/flutter/tests/MinikinFontForTest.cpp           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/engine/src/flutter/libs/minikin/FontCollection.cpp b/engine/src/flutter/libs/minikin/FontCollection.cpp
index ddda7bc09a..f5e2290318 100644
--- a/engine/src/flutter/libs/minikin/FontCollection.cpp
+++ b/engine/src/flutter/libs/minikin/FontCollection.cpp
@@ -20,7 +20,7 @@
 
 #include <algorithm>
 
-#include <android/log.h>
+#include <log/log.h>
 #include "unicode/unistr.h"
 #include "unicode/unorm2.h"
 
diff --git a/engine/src/flutter/libs/minikin/FontFamily.cpp b/engine/src/flutter/libs/minikin/FontFamily.cpp
index 6d45c67126..cbfa1cfffc 100644
--- a/engine/src/flutter/libs/minikin/FontFamily.cpp
+++ b/engine/src/flutter/libs/minikin/FontFamily.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <android/log.h>
+#include <log/log.h>
 #include <utils/JenkinsHash.h>
 
 #include <hb.h>
diff --git a/engine/src/flutter/libs/minikin/FontLanguageListCache.cpp b/engine/src/flutter/libs/minikin/FontLanguageListCache.cpp
index 9a409e658b..b5c40f1ddb 100644
--- a/engine/src/flutter/libs/minikin/FontLanguageListCache.cpp
+++ b/engine/src/flutter/libs/minikin/FontLanguageListCache.cpp
@@ -21,7 +21,7 @@
 #include <unicode/uloc.h>
 #include <unordered_set>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include "FontLanguage.h"
 #include "MinikinInternal.h"
diff --git a/engine/src/flutter/libs/minikin/HbFontCache.cpp b/engine/src/flutter/libs/minikin/HbFontCache.cpp
index 08687571ba..3137125a26 100644
--- a/engine/src/flutter/libs/minikin/HbFontCache.cpp
+++ b/engine/src/flutter/libs/minikin/HbFontCache.cpp
@@ -18,7 +18,7 @@
 
 #include "HbFontCache.h"
 
-#include <android/log.h>
+#include <log/log.h>
 #include <utils/LruCache.h>
 
 #include <hb.h>
diff --git a/engine/src/flutter/libs/minikin/Layout.cpp b/engine/src/flutter/libs/minikin/Layout.cpp
index 45cb06680f..d63cda0d30 100644
--- a/engine/src/flutter/libs/minikin/Layout.cpp
+++ b/engine/src/flutter/libs/minikin/Layout.cpp
@@ -24,7 +24,7 @@
 #include <unicode/ubidi.h>
 #include <vector>
 
-#include <android/log.h>
+#include <log/log.h>
 #include <utils/JenkinsHash.h>
 #include <utils/LruCache.h>
 #include <utils/Singleton.h>
diff --git a/engine/src/flutter/libs/minikin/LineBreaker.cpp b/engine/src/flutter/libs/minikin/LineBreaker.cpp
index bc8cb800ee..21d1d8df6c 100644
--- a/engine/src/flutter/libs/minikin/LineBreaker.cpp
+++ b/engine/src/flutter/libs/minikin/LineBreaker.cpp
@@ -20,7 +20,7 @@
 
 #include <limits>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include <minikin/Layout.h>
 #include <minikin/LineBreaker.h>
diff --git a/engine/src/flutter/libs/minikin/MinikinInternal.cpp b/engine/src/flutter/libs/minikin/MinikinInternal.cpp
index 5900c1852c..a5d1eada1f 100644
--- a/engine/src/flutter/libs/minikin/MinikinInternal.cpp
+++ b/engine/src/flutter/libs/minikin/MinikinInternal.cpp
@@ -21,7 +21,7 @@
 #include "HbFontCache.h"
 #include "generated/UnicodeData.h"
 
-#include <android/log.h>
+#include <log/log.h>
 
 namespace android {
 
diff --git a/engine/src/flutter/libs/minikin/SparseBitSet.cpp b/engine/src/flutter/libs/minikin/SparseBitSet.cpp
index aa73c12670..ac21bb8f0c 100644
--- a/engine/src/flutter/libs/minikin/SparseBitSet.cpp
+++ b/engine/src/flutter/libs/minikin/SparseBitSet.cpp
@@ -19,7 +19,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include <minikin/SparseBitSet.h>
 
diff --git a/engine/src/flutter/tests/FontTestUtils.cpp b/engine/src/flutter/tests/FontTestUtils.cpp
index 9d36d2f6cb..f799f199e0 100644
--- a/engine/src/flutter/tests/FontTestUtils.cpp
+++ b/engine/src/flutter/tests/FontTestUtils.cpp
@@ -19,7 +19,7 @@
 #include <libxml/tree.h>
 #include <unistd.h>
 
-#include <android/log.h>
+#include <log/log.h>
 
 #include "FontLanguage.h"
 #include "MinikinFontForTest.h"
diff --git a/engine/src/flutter/tests/MinikinFontForTest.cpp b/engine/src/flutter/tests/MinikinFontForTest.cpp
index 7933d2457e..9330a652dd 100644
--- a/engine/src/flutter/tests/MinikinFontForTest.cpp
+++ b/engine/src/flutter/tests/MinikinFontForTest.cpp
@@ -22,7 +22,7 @@
 
 #include <SkTypeface.h>
 
-#include <android/log.h>
+#include <log/log.h>
 
 MinikinFontForTest::MinikinFontForTest(const std::string& font_path) :
     MinikinFontForTest(font_path, SkTypeface::CreateFromFile(font_path.c_str())) {