summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadaf Ebrahimi <sadafebrahimi@google.com>2023-10-30 15:33:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-30 15:33:25 +0000
commit13608e33c852c2ade9d453a426a131de212fa891 (patch)
tree6fe1b01c9b774d72d30963a83c9bb8068cfbc0db
parent6995304e57659f95d2ec6824fa2749012bff0d38 (diff)
parent9aff4f0e90fa9d5b0f57f48e55de989a29b71e19 (diff)
downloadminikin-13608e33c852c2ade9d453a426a131de212fa891.tar.gz
Adjust with changes in libxml2 upgrade am: 415112fea8 am: 9aff4f0e90
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004 Change-Id: I98f81ad4664a0489f52aa955ad2c1705645698d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tests/util/FontTestUtils.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/util/FontTestUtils.cpp b/tests/util/FontTestUtils.cpp
index a1025fe..5308e0c 100644
--- a/tests/util/FontTestUtils.cpp
+++ b/tests/util/FontTestUtils.cpp
@@ -16,18 +16,18 @@
#define LOG_TAG "Minikin"
-#include <libxml/tree.h>
+#include "FontTestUtils.h"
+
+#include <libxml/parser.h>
#include <log/log.h>
#include <unistd.h>
-#include "minikin/FontCollection.h"
-#include "minikin/FontFamily.h"
-#include "minikin/LocaleList.h"
-
-#include "FontTestUtils.h"
#include "FreeTypeMinikinFontForTest.h"
#include "LocaleListCache.h"
#include "MinikinInternal.h"
+#include "minikin/FontCollection.h"
+#include "minikin/FontFamily.h"
+#include "minikin/LocaleList.h"
namespace minikin {