summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Derek Sollenberger <djsollen@google.com> 2019-07-16 13:23:29 -0400
committer Derek Sollenberger <djsollen@google.com> 2019-07-16 14:23:39 -0400
commit8b994191924564624ef831b4fd4c67a1adbd624f (patch)
treebbc74f6a0b18cf8a35409721ea7dfb4d85f2227a /libs
parent95eab8ae45863184acb901219f9fceb2dc190ac1 (diff)
Update includes to begin isolating graphics classes.
GraphicsJNI.h will only be visible to files in the graphics component and this CL begins to remove all usages of that header that are known to be outside the graphic component. Test: compile Bug: 137655431 Change-Id: If310782e5d95d05ab7cbd54dafa5771d315707a7
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/RecordingCanvas.h1
-rw-r--r--libs/hwui/renderthread/RenderProxy.cpp2
-rw-r--r--libs/hwui/renderthread/RenderProxy.h2
-rw-r--r--libs/hwui/renderthread/VulkanSurface.h1
4 files changed, 4 insertions, 2 deletions
diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h
index 7269bcad3d7a..16ec877002f7 100644
--- a/libs/hwui/RecordingCanvas.h
+++ b/libs/hwui/RecordingCanvas.h
@@ -29,7 +29,6 @@
#include "SkPaint.h"
#include "SkPath.h"
#include "SkRect.h"
-#include "SkTDArray.h"
#include "SkTemplates.h"
#include <vector>
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index e50428b2ee62..40fbdffaf90a 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -16,6 +16,8 @@
#include "RenderProxy.h"
+#include <gui/Surface.h>
+
#include "DeferredLayerUpdater.h"
#include "DisplayList.h"
#include "Properties.h"
diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h
index a0f08cbd26f9..c3eb6ede9bf2 100644
--- a/libs/hwui/renderthread/RenderProxy.h
+++ b/libs/hwui/renderthread/RenderProxy.h
@@ -19,7 +19,6 @@
#include <SkBitmap.h>
#include <cutils/compiler.h>
-#include <gui/Surface.h>
#include <utils/Functor.h>
#include "../FrameMetricsObserver.h"
@@ -30,6 +29,7 @@
namespace android {
class GraphicBuffer;
+class Surface;
namespace uirenderer {
diff --git a/libs/hwui/renderthread/VulkanSurface.h b/libs/hwui/renderthread/VulkanSurface.h
index 5fa860a20916..5717bb3afe5b 100644
--- a/libs/hwui/renderthread/VulkanSurface.h
+++ b/libs/hwui/renderthread/VulkanSurface.h
@@ -17,6 +17,7 @@
#include <system/graphics.h>
#include <system/window.h>
+#include <ui/BufferQueueDefs.h>
#include <vulkan/vulkan.h>
#include <SkRefCnt.h>