commit 867c43de0544217d26c3ee18f4d6603bb2ea97ce
author John Reck <jreck@google.com> Thu Aug 30 16:47:59 2018 +0000
committer Stan Iliev <stani@google.com> Thu Aug 30 18:42:08 2018 +0000
tree d780e25edaa90578c80309a105d6fe2e9eea71c8
parent c8e22a653297837da9a80b0ba65f6854c8986c96

Revert "TextureView Vulkan support and optimized OpenGL draw"

This reverts commit c8e22a653297837da9a80b0ba65f6854c8986c96.

Reason for revert: broke camera, b/113555199

Bug: 113555199
Change-Id: Iae9b462694d5de0cd99427afead63b567fb4d71d

native/android/surface_texture.cpp

diff --git a/native/android/surface_texture.cpp b/native/android/surface_texture.cpp
index ced279277..b266881 100644
--- a/native/android/surface_texture.cpp
+++ b/native/android/surface_texture.cpp
@@ -21,16 +21,15 @@
 
 #include <utils/Log.h>
 
+#include <gui/GLConsumer.h>
 #include <gui/Surface.h>
 
 #include <android_runtime/android_graphics_SurfaceTexture.h>
 
-#include "surfacetexture/SurfaceTexture.h"
-
 using namespace android;
 
 struct ASurfaceTexture {
-    sp<SurfaceTexture> consumer;
+    sp<GLConsumer> consumer;
     sp<IGraphicBufferProducer> producer;
 };