[HWUI] Update Ganesh includes to specify new location
Upstream Skia changes I7269acfae5c26518c2a61930a8af9584682751cd and
Ibc927d0ae66a05546957300090a651614e720fad are moving Ganesh headers into
Skia's include/gpu/ganesh/ directory. Android's current includes are
relying on temporary shims which will soon be removed.
Note: I also sorted some includes to try and calm the chaos a tiny bit,
but didn't go out of my way to update all non-Ganesh Skia includes.
clang-format decided to further re-arrange things, so I'm hoping this
doesn't make future merge conflicts too painful.
Bug: 40044159
Test: builds after locally deleting Skia's temporary shims
Flag: EXEMPT refactor
Change-Id: I5099e215a58915a5e6c7b3434f9855006dda8c60
diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp
index 0f29613..20c2b1a 100644
--- a/libs/hwui/renderthread/VulkanSurface.cpp
+++ b/libs/hwui/renderthread/VulkanSurface.cpp
@@ -16,12 +16,13 @@
#include "VulkanSurface.h"
-#include <include/android/SkSurfaceAndroid.h>
-#include <GrDirectContext.h>
#include <SkSurface.h>
+#include <gui/TraceUtils.h>
+#include <include/android/SkSurfaceAndroid.h>
+#include <include/gpu/ganesh/GrDirectContext.h>
+
#include <algorithm>
-#include <gui/TraceUtils.h>
#include "VulkanManager.h"
#include "utils/Color.h"
