2 files changed, 12 insertions, 0 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 1a72b2236d..f1c4a4ca74 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -60,6 +60,10 @@ extern void SkPDFImageDumpStats();
     #include <unistd.h>
 #endif
 
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_HAS_HEIF_LIBRARY)
+#include <binder/IPCThreadState.h>
+#endif
+
 extern bool gSkForceRasterPipelineBlitter;
 
 DECLARE_bool(undefok);
@@ -1313,6 +1317,9 @@ static sk_sp<SkTypeface> create_from_name(const char familyName[], SkFontStyle s
 extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkFontStyle );
 
 int main(int argc, char** argv) {
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_HAS_HEIF_LIBRARY)
+    android::ProcessState::self()->startThreadPool();
+#endif
     SkCommandLineFlags::Parse(argc, argv);
 
     if (!FLAGS_nativeFonts) {
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index e68a5677fc..0dfada3ea2 100644
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -185,6 +185,11 @@ cc_test {
     srcs: [
         $dm_srcs
     ],
+
+    shared_libs: [
+        "libbinder",
+        "libutils",
+    ],
 }
 
 cc_test {