commit 760d3514cacc027ac659f4607bb0fcc3e1b27568
author Seigo Nonaka <nona@google.com> Thu Oct 01 12:29:03 2020 -0700
committer Seigo Nonaka <nona@google.com> Thu Oct 01 18:07:29 2020 -0700
tree 0b5f18571a9ed3468eab23caa34bbb23f5ac0052
parent 16b02d489932542812b84bc8bb1771eb266b47ed

Follow minikin library update for preventing copy-and-move Font

Bug: 169871852
Test: minikin_tests
Test: hwui_unit_tests
Test: atst CtsGraphicsTestCases
Change-Id: Ic8a272e5dec9feacf5e1c49542a0623782950108

libs/hwui/jni/FontFamily.cpp

diff --git a/libs/hwui/jni/FontFamily.cpp b/libs/hwui/jni/FontFamily.cpp
index 68eaa0a..2e85840 100644
--- a/libs/hwui/jni/FontFamily.cpp
+++ b/libs/hwui/jni/FontFamily.cpp
@@ -42,7 +42,7 @@
         : langId(langId), variant(static_cast<minikin::FamilyVariant>(variant)) {}
     uint32_t langId;
     minikin::FamilyVariant variant;
-    std::vector<minikin::Font> fonts;
+    std::vector<std::shared_ptr<minikin::Font>> fonts;
     std::vector<minikin::FontVariation> axes;
 };