diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-10-30 16:07:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-30 16:07:53 +0000 |
| commit | ac54ff35c02c9ce4e0cde4e0d2fe7b2f9d73acaa (patch) | |
| tree | 55ca877d6e9f50eeef809d971de8febe5a4ba487 | |
| parent | fd8349e7a33b3db583e4ea49714c585d282fea52 (diff) | |
| parent | 13608e33c852c2ade9d453a426a131de212fa891 (diff) | |
| download | minikin-ac54ff35c02c9ce4e0cde4e0d2fe7b2f9d73acaa.tar.gz | |
Adjust with changes in libxml2 upgrade am: 415112fea8 am: 9aff4f0e90 am: 13608e33c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004
Change-Id: Ida9b88a1caf5817e7ad26020378b937c4ee2f43f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/util/FontTestUtils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/util/FontTestUtils.cpp b/tests/util/FontTestUtils.cpp index 9e45bbf..0d563b8 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 { |