Merge "Remove include of private SkUtils.h file"

2023-01-25 18:33:52 +00:00
parent 3f35e7b839 b63b4cacc2
commit f0f201ad06
3 changed files with 3 additions and 3 deletions
--- 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>
--- 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>
--- 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>