summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Kudasov <kudasov@google.com>2019-06-27 18:09:30 +0100
committerFedor Kudasov <kudasov@google.com>2019-06-27 17:11:37 +0000
commit6bdd90f70dbc848ec2a1db55ce5a0360ba20b56c (patch)
tree5a5e7488d846d5a70da2f87eebe0be1657c328f7
parent7991ae1a5f521a429bb8eb240dcad96a3b54daeb (diff)
Remove unused (mostly GL-related) headers
Bug: 117921091 Test: all tests should pass Change-Id: I419aafd30bfc19f2180eedf924bbd55d5cd36170
-rw-r--r--core/jni/android/graphics/SurfaceTexture.cpp1
-rw-r--r--core/jni/android_view_Surface.cpp1
-rw-r--r--core/jni/include/android_runtime/android_view_Surface.h1
-rw-r--r--libs/hwui/renderthread/CanvasContext.cpp3
-rw-r--r--libs/hwui/renderthread/RenderProxy.cpp3
5 files changed, 0 insertions, 9 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp
index 73dc65643a8b..c74c2644c645 100644
--- a/core/jni/android/graphics/SurfaceTexture.cpp
+++ b/core/jni/android/graphics/SurfaceTexture.cpp
@@ -23,7 +23,6 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
-#include <gui/GLConsumer.h>
#include <gui/Surface.h>
#include <gui/BufferQueue.h>
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index 6e41cc9f1251..7c429944b521 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -34,7 +34,6 @@
#include <gui/Surface.h>
#include <gui/view/Surface.h>
#include <gui/SurfaceControl.h>
-#include <gui/GLConsumer.h>
#include <ui/Rect.h>
#include <ui/Region.h>
diff --git a/core/jni/include/android_runtime/android_view_Surface.h b/core/jni/include/android_runtime/android_view_Surface.h
index 47a952f35a96..637b8232105f 100644
--- a/core/jni/include/android_runtime/android_view_Surface.h
+++ b/core/jni/include/android_runtime/android_view_Surface.h
@@ -18,7 +18,6 @@
#define _ANDROID_VIEW_SURFACE_H
#include <android/native_window.h>
-#include <system/graphics.h>
#include <ui/PublicFormat.h>
#include "jni.h"
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index c9203d9bb530..550c27d7a051 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -19,7 +19,6 @@
#include "../Properties.h"
#include "AnimationContext.h"
-#include "EglManager.h"
#include "Frame.h"
#include "LayerUpdateQueue.h"
#include "Properties.h"
@@ -33,8 +32,6 @@
#include "utils/TimeUtils.h"
#include "utils/TraceUtils.h"
-#include <cutils/properties.h>
-#include <private/hwui/DrawGlInfo.h>
#include <strings.h>
#include <fcntl.h>
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index 20247dc7c861..3dd1d4462d02 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -22,11 +22,8 @@
#include "Readback.h"
#include "Rect.h"
#include "WebViewFunctorManager.h"
-#include "pipeline/skia/SkiaOpenGLPipeline.h"
#include "pipeline/skia/VectorDrawableAtlas.h"
-#include "renderstate/RenderState.h"
#include "renderthread/CanvasContext.h"
-#include "renderthread/EglManager.h"
#include "renderthread/RenderTask.h"
#include "renderthread/RenderThread.h"
#include "utils/Macros.h"