commit b63b4cacc26ad7703ec92739b3f91d4946cd40b7
author Kevin Lubick <kjlubick@google.com> Wed Jan 25 15:18:23 2023 +0000
committer Kevin Lubick <kjlubick@google.com> Wed Jan 25 15:20:34 2023 +0000
tree a5737d9156b2f91bb0f52e05e43cdcefc0d6ab0b
parent 16878e79821cc23a10d4ae5f068c15aafee6937a

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

diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp
index 2f3e9bf..0d5995a 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>

libs/hwui/jni/Movie.cpp

diff --git a/libs/hwui/jni/Movie.cpp b/libs/hwui/jni/Movie.cpp
index bb8c99a..7dfd874 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>

libs/hwui/jni/Utils.cpp

diff --git a/libs/hwui/jni/Utils.cpp b/libs/hwui/jni/Utils.cpp
index 106c6db..9f5a214 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>