From 555d84c6f98eafcbe677cdcb8e9605760acd8ce5 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Wed, 28 Sep 2016 15:23:30 -0700
Subject: [PATCH] minikin: Replace cutils/log.h with android/log.h or log/log.h

- replace cutils/log.h with android/log.h (main buffer logging)
- replace cutils/log.h with log.log.h (+SafetyNet logging)
- define LOG_TAG before use.

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I7a4803dd66f31b7103e09e5ff5b8fa523fa0fd60
---
 libs/minikin/CmapCoverage.cpp          |  3 ++-
 libs/minikin/FontCollection.cpp        |  3 ++-
 libs/minikin/FontFamily.cpp            | 10 +++++-----
 libs/minikin/FontLanguageListCache.cpp |  5 +++--
 libs/minikin/HbFontCache.cpp           |  5 +++--
 libs/minikin/Layout.cpp                |  9 ++++-----
 libs/minikin/LineBreaker.cpp           |  5 +++--
 libs/minikin/Measurement.cpp           |  3 ++-
 libs/minikin/MinikinInternal.cpp       |  3 ++-
 libs/minikin/SparseBitSet.cpp          |  6 +++++-
 libs/minikin/WordBreaker.cpp           |  3 ++-
 tests/FontFamilyTest.cpp               |  5 ++---
 tests/FontTestUtils.cpp                | 10 ++++++----
 tests/HbFontCacheTest.cpp              |  8 ++++----
 tests/MinikinFontForTest.cpp           |  4 +++-
 tests/WordBreakerTests.cpp             |  7 ++++---
 16 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/libs/minikin/CmapCoverage.cpp b/libs/minikin/CmapCoverage.cpp
index 2961d2ffa8d..86d8981c8b0 100644
--- a/libs/minikin/CmapCoverage.cpp
+++ b/libs/minikin/CmapCoverage.cpp
@@ -17,11 +17,12 @@
 // Determine coverage of font given its raw "cmap" OpenType table
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
 
 #include <vector>
 using std::vector;
 
+#include <log/log.h>
+
 #include <minikin/SparseBitSet.h>
 #include <minikin/CmapCoverage.h>
 
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp
index 33418ab1b5d..ddda7bc09a6 100644
--- a/libs/minikin/FontCollection.cpp
+++ b/libs/minikin/FontCollection.cpp
@@ -17,9 +17,10 @@
 // #define VERBOSE_DEBUG
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
+
 #include <algorithm>
 
+#include <android/log.h>
 #include "unicode/unistr.h"
 #include "unicode/unorm2.h"
 
diff --git a/libs/minikin/FontFamily.cpp b/libs/minikin/FontFamily.cpp
index 7a8e79f508f..6d45c67126e 100644
--- a/libs/minikin/FontFamily.cpp
+++ b/libs/minikin/FontFamily.cpp
@@ -16,24 +16,24 @@
 
 #define LOG_TAG "Minikin"
 
-#include <cutils/log.h>
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include <android/log.h>
+#include <utils/JenkinsHash.h>
+
 #include <hb.h>
 #include <hb-ot.h>
 
-#include <utils/JenkinsHash.h>
-
 #include "FontLanguage.h"
 #include "FontLanguageListCache.h"
 #include "HbFontCache.h"
 #include "MinikinInternal.h"
-#include <minikin/MinikinFont.h>
 #include <minikin/AnalyzeStyle.h>
 #include <minikin/CmapCoverage.h>
 #include <minikin/FontFamily.h>
+#include <minikin/MinikinFont.h>
 
 using std::vector;
 
diff --git a/libs/minikin/FontLanguageListCache.cpp b/libs/minikin/FontLanguageListCache.cpp
index 6b661f03846..9a409e658bf 100644
--- a/libs/minikin/FontLanguageListCache.cpp
+++ b/libs/minikin/FontLanguageListCache.cpp
@@ -18,12 +18,13 @@
 
 #include "FontLanguageListCache.h"
 
-#include <cutils/log.h>
 #include <unicode/uloc.h>
 #include <unordered_set>
 
-#include "MinikinInternal.h"
+#include <android/log.h>
+
 #include "FontLanguage.h"
+#include "MinikinInternal.h"
 
 namespace android {
 
diff --git a/libs/minikin/HbFontCache.cpp b/libs/minikin/HbFontCache.cpp
index 3be942d7b9e..08687571ba8 100644
--- a/libs/minikin/HbFontCache.cpp
+++ b/libs/minikin/HbFontCache.cpp
@@ -18,10 +18,11 @@
 
 #include "HbFontCache.h"
 
-#include <cutils/log.h>
+#include <android/log.h>
+#include <utils/LruCache.h>
+
 #include <hb.h>
 #include <hb-ot.h>
-#include <utils/LruCache.h>
 
 #include <minikin/MinikinFont.h>
 #include "MinikinInternal.h"
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 5ba72a4bb2c..45cb06680ff 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -15,29 +15,28 @@
  */
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
-
-#include <math.h>
 
 #include <algorithm>
 #include <fstream>
 #include <iostream>  // for debugging
+#include <math.h>
 #include <string>
+#include <unicode/ubidi.h>
 #include <vector>
 
+#include <android/log.h>
 #include <utils/JenkinsHash.h>
 #include <utils/LruCache.h>
 #include <utils/Singleton.h>
 #include <utils/String16.h>
 
-#include <unicode/ubidi.h>
 #include <hb-icu.h>
 #include <hb-ot.h>
 
 #include "FontLanguage.h"
 #include "FontLanguageListCache.h"
-#include "LayoutUtils.h"
 #include "HbFontCache.h"
+#include "LayoutUtils.h"
 #include "MinikinInternal.h"
 #include <minikin/MinikinFontFreeType.h>
 #include <minikin/Layout.h>
diff --git a/libs/minikin/LineBreaker.cpp b/libs/minikin/LineBreaker.cpp
index 2a71f044d23..bc8cb800ee7 100644
--- a/libs/minikin/LineBreaker.cpp
+++ b/libs/minikin/LineBreaker.cpp
@@ -16,10 +16,11 @@
 
 #define VERBOSE_DEBUG 0
 
+#define LOG_TAG "Minikin"
+
 #include <limits>
 
-#define LOG_TAG "Minikin"
-#include <cutils/log.h>
+#include <android/log.h>
 
 #include <minikin/Layout.h>
 #include <minikin/LineBreaker.h>
diff --git a/libs/minikin/Measurement.cpp b/libs/minikin/Measurement.cpp
index 1ba6678373b..b292c9aba94 100644
--- a/libs/minikin/Measurement.cpp
+++ b/libs/minikin/Measurement.cpp
@@ -15,11 +15,12 @@
  */
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
 
 #include <cmath>
 #include <unicode/uchar.h>
 
+#include <android/log.h>
+
 #include <minikin/GraphemeBreak.h>
 #include <minikin/Measurement.h>
 
diff --git a/libs/minikin/MinikinInternal.cpp b/libs/minikin/MinikinInternal.cpp
index 5cb94914c9e..5900c1852ca 100644
--- a/libs/minikin/MinikinInternal.cpp
+++ b/libs/minikin/MinikinInternal.cpp
@@ -15,12 +15,13 @@
  */
 
 // Definitions internal to Minikin
+#define LOG_TAG "Minikin"
 
 #include "MinikinInternal.h"
 #include "HbFontCache.h"
 #include "generated/UnicodeData.h"
 
-#include <cutils/log.h>
+#include <android/log.h>
 
 namespace android {
 
diff --git a/libs/minikin/SparseBitSet.cpp b/libs/minikin/SparseBitSet.cpp
index de0791445cd..aa73c126707 100644
--- a/libs/minikin/SparseBitSet.cpp
+++ b/libs/minikin/SparseBitSet.cpp
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-#include <cutils/log.h>
+#define LOG_TAG "SparseBitSet"
+
 #include <stddef.h>
 #include <string.h>
+
+#include <android/log.h>
+
 #include <minikin/SparseBitSet.h>
 
 namespace android {
diff --git a/libs/minikin/WordBreaker.cpp b/libs/minikin/WordBreaker.cpp
index 38f03caf6a0..7fc5824b6d0 100644
--- a/libs/minikin/WordBreaker.cpp
+++ b/libs/minikin/WordBreaker.cpp
@@ -15,7 +15,8 @@
  */
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
+
+#include <android/log.h>
 
 #include <minikin/WordBreaker.h>
 #include "MinikinInternal.h"
diff --git a/tests/FontFamilyTest.cpp b/tests/FontFamilyTest.cpp
index 1b2457695c4..1975b7e7fd5 100644
--- a/tests/FontFamilyTest.cpp
+++ b/tests/FontFamilyTest.cpp
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <minikin/FontFamily.h>
 
-#include <cutils/log.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
 
 #include "FontLanguageListCache.h"
 #include "ICUTestBase.h"
diff --git a/tests/FontTestUtils.cpp b/tests/FontTestUtils.cpp
index fdc3ed6ee91..9d36d2f6cb9 100644
--- a/tests/FontTestUtils.cpp
+++ b/tests/FontTestUtils.cpp
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "Minikin"
+
 #include <libxml/tree.h>
+#include <unistd.h>
 
-#include <minikin/FontCollection.h>
-#include <minikin/FontFamily.h>
-
-#include <cutils/log.h>
+#include <android/log.h>
 
 #include "FontLanguage.h"
 #include "MinikinFontForTest.h"
+#include <minikin/FontCollection.h>
+#include <minikin/FontFamily.h>
 
 android::FontCollection* getFontCollection(const char* fontDir, const char* fontXml) {
     xmlDoc* doc = xmlReadFile(fontXml, NULL, 0);
diff --git a/tests/HbFontCacheTest.cpp b/tests/HbFontCacheTest.cpp
index 2dee61aff06..f1b1d311190 100644
--- a/tests/HbFontCacheTest.cpp
+++ b/tests/HbFontCacheTest.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include "HbFontCache.h"
 
-#include <cutils/log.h>
-#include <hb.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
 #include <utils/Mutex.h>
 
+#include <hb.h>
+
 #include "MinikinInternal.h"
 #include "MinikinFontForTest.h"
 #include <minikin/MinikinFont.h>
diff --git a/tests/MinikinFontForTest.cpp b/tests/MinikinFontForTest.cpp
index 66dd4ea4734..7933d2457e0 100644
--- a/tests/MinikinFontForTest.cpp
+++ b/tests/MinikinFontForTest.cpp
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "Minikin"
+
 #include "MinikinFontForTest.h"
 
 #include <minikin/MinikinFont.h>
 
 #include <SkTypeface.h>
 
-#include <cutils/log.h>
+#include <android/log.h>
 
 MinikinFontForTest::MinikinFontForTest(const std::string& font_path) :
     MinikinFontForTest(font_path, SkTypeface::CreateFromFile(font_path.c_str())) {
diff --git a/tests/WordBreakerTests.cpp b/tests/WordBreakerTests.cpp
index 8ed87cc5069..0bb614732a6 100644
--- a/tests/WordBreakerTests.cpp
+++ b/tests/WordBreakerTests.cpp
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "Minikin"
+
+#include <android/log.h>
 #include <gtest/gtest.h>
+
 #include "ICUTestBase.h"
 #include "UnicodeUtils.h"
 #include <minikin/WordBreaker.h>
@@ -22,9 +26,6 @@
 #include <unicode/uclean.h>
 #include <unicode/udata.h>
 
-#define LOG_TAG "Minikin"
-#include <cutils/log.h>
-
 #ifndef NELEM
 #define NELEM(x) ((sizeof(x) / sizeof((x)[0])))
 #endif