From b63b4cacc26ad7703ec92739b3f91d4946cd40b7 Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Wed, 25 Jan 2023 15:18:23 +0000
Subject: [PATCH] Remove include of private SkUtils.h file

Nothing from SkUtils.h appeared to actually be used.
I also added some missing (transitive) #includes

Change-Id: Iad7bac9fdd978c581dd850485d8979b779a46fc8
Bug: skbug.com/13983
---
 libs/hwui/jni/BitmapFactory.cpp | 1 -
 libs/hwui/jni/Movie.cpp         | 2 +-
 libs/hwui/jni/Utils.cpp         | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp
index 2f3e9bf29c81f..0d5995aebbe26 100644
--- a/libs/hwui/jni/BitmapFactory.cpp
+++ b/libs/hwui/jni/BitmapFactory.cpp
@@ -22,7 +22,6 @@
 #include "SkSize.h"
 #include "SkStream.h"
 #include "SkString.h"
-#include "SkUtils.h"
 #include "Utils.h"
 
 #include <HardwareBitmapUploader.h>
diff --git a/libs/hwui/jni/Movie.cpp b/libs/hwui/jni/Movie.cpp
index bb8c99a73edf5..7dfd8740b2d73 100644
--- a/libs/hwui/jni/Movie.cpp
+++ b/libs/hwui/jni/Movie.cpp
@@ -3,8 +3,8 @@
 #include "GraphicsJNI.h"
 #include <nativehelper/ScopedLocalRef.h>
 #include "Movie.h"
+#include "SkRefCnt.h"
 #include "SkStream.h"
-#include "SkUtils.h"
 #include "Utils.h"
 
 #include <androidfw/Asset.h>
diff --git a/libs/hwui/jni/Utils.cpp b/libs/hwui/jni/Utils.cpp
index 106c6db57e18b..9f5a2145792c7 100644
--- a/libs/hwui/jni/Utils.cpp
+++ b/libs/hwui/jni/Utils.cpp
@@ -15,8 +15,9 @@
  */
 
 #include "Utils.h"
-#include "SkUtils.h"
 #include "SkData.h"
+#include "SkRefCnt.h"
+#include "SkStream.h"
 
 #include <inttypes.h>
 #include <log/log.h>