summaryrefslogtreecommitdiff
path: root/native
diff options
context:
space:
mode:
author Sadaf Ebrahimi <sadafebrahimi@google.com> 2023-10-04 18:05:54 +0000
committer Sadaf Ebrahimi <sadafebrahimi@google.com> 2023-10-30 15:06:11 +0000
commit81a4a53eec50dc95553c0b59fa44d5ccaf368efb (patch)
treed398d4b47678d80d1ab86599e01f778d62e943a9 /native
parentc056440a34955acdaf059ca3ed4d605981781de6 (diff)
Adjust with changes in libxml2 upgrade
Bug: http://b/307806447 Test: TreeHugger Change-Id: Ib07514426643d8682c768b87e32fff2abddcda13
Diffstat (limited to 'native')
-rw-r--r--native/android/system_fonts.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/native/android/system_fonts.cpp b/native/android/system_fonts.cpp
index fe3132e3d2a3..ceab164aa324 100644
--- a/native/android/system_fonts.cpp
+++ b/native/android/system_fonts.cpp
@@ -21,22 +21,20 @@
#include <android/font.h>
#include <android/font_matcher.h>
#include <android/system_fonts.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
#include <errno.h>
#include <fcntl.h>
-#include <libxml/tree.h>
-#include <log/log.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
#include <hwui/MinikinSkia.h>
+#include <libxml/parser.h>
+#include <log/log.h>
#include <minikin/FontCollection.h>
#include <minikin/LocaleList.h>
#include <minikin/SystemFonts.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <memory>
+#include <string>
+#include <vector>
struct XmlCharDeleter {
void operator()(xmlChar* b) { xmlFree(b); }