summaryrefslogtreecommitdiff
path: root/native/android
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-08-29 15:51:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-08-29 15:51:15 +0000
commit54b9892f3cc8ed30bfe660ff2957aefeb484b092 (patch)
tree0c9374ad222a99e4c7b709230e594be12d57dc24 /native/android
parentc8344a19637ff39f84cbd6acecb952c80f2c4de5 (diff)
parentc8e22a653297837da9a80b0ba65f6854c8986c96 (diff)
Merge "TextureView Vulkan support and optimized OpenGL draw"
Diffstat (limited to 'native/android')
-rw-r--r--native/android/Android.bp1
-rw-r--r--native/android/surface_texture.cpp5
2 files changed, 4 insertions, 2 deletions
diff --git a/native/android/Android.bp b/native/android/Android.bp
index 4fb5e748aaac..43847cc4ab06 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -64,6 +64,7 @@ cc_library_shared {
"libsensor",
"libandroid_runtime",
"libnetd_client",
+ "libhwui",
],
static_libs: [
diff --git a/native/android/surface_texture.cpp b/native/android/surface_texture.cpp
index b26688190ccd..ced2792775d4 100644
--- a/native/android/surface_texture.cpp
+++ b/native/android/surface_texture.cpp
@@ -21,15 +21,16 @@
#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<GLConsumer> consumer;
+ sp<SurfaceTexture> consumer;
sp<IGraphicBufferProducer> producer;
};