minikin: use log/log.h when utilizing ALOG macros am: 39ab40115f
am: 585b3720fb
Change-Id: I228e76e2fffcab14996e38f19687e393985e2da0
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp
index ddda7bc..f5e2290 100644
--- a/libs/minikin/FontCollection.cpp
+++ b/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/libs/minikin/FontFamily.cpp b/libs/minikin/FontFamily.cpp
index 6d45c67..cbfa1cf 100644
--- a/libs/minikin/FontFamily.cpp
+++ b/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/libs/minikin/FontLanguageListCache.cpp b/libs/minikin/FontLanguageListCache.cpp
index 9a409e6..b5c40f1 100644
--- a/libs/minikin/FontLanguageListCache.cpp
+++ b/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/libs/minikin/HbFontCache.cpp b/libs/minikin/HbFontCache.cpp
index 0868757..3137125 100644
--- a/libs/minikin/HbFontCache.cpp
+++ b/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/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 45cb066..d63cda0 100644
--- a/libs/minikin/Layout.cpp
+++ b/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/libs/minikin/LineBreaker.cpp b/libs/minikin/LineBreaker.cpp
index bc8cb80..21d1d8d 100644
--- a/libs/minikin/LineBreaker.cpp
+++ b/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/libs/minikin/MinikinInternal.cpp b/libs/minikin/MinikinInternal.cpp
index 5900c18..a5d1ead 100644
--- a/libs/minikin/MinikinInternal.cpp
+++ b/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/libs/minikin/SparseBitSet.cpp b/libs/minikin/SparseBitSet.cpp
index aa73c12..ac21bb8 100644
--- a/libs/minikin/SparseBitSet.cpp
+++ b/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/tests/FontTestUtils.cpp b/tests/FontTestUtils.cpp
index 9d36d2f..f799f19 100644
--- a/tests/FontTestUtils.cpp
+++ b/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/tests/MinikinFontForTest.cpp b/tests/MinikinFontForTest.cpp
index 7933d24..9330a65 100644
--- a/tests/MinikinFontForTest.cpp
+++ b/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())) {
