diff options
| author | Stan Iliev <stani@google.com> | 2018-08-30 18:56:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-30 18:56:41 +0000 |
| commit | e6cfb09cc4938078d14b1b4abca1678ac8fb170c (patch) | |
| tree | c71f82bc74a53be28d30c88ca3b8f84b666578de /native/android | |
| parent | c72888de5dec8327da3d1a8d328f2c92a629d91e (diff) | |
| parent | 867c43de0544217d26c3ee18f4d6603bb2ea97ce (diff) | |
Merge "Revert "TextureView Vulkan support and optimized OpenGL draw""
Diffstat (limited to 'native/android')
| -rw-r--r-- | native/android/Android.bp | 1 | ||||
| -rw-r--r-- | native/android/surface_texture.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/native/android/Android.bp b/native/android/Android.bp index 43847cc4ab06..4fb5e748aaac 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -64,7 +64,6 @@ 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 ced2792775d4..b26688190ccd 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; }; |