commit 0fe4c4795015357290b098715f6d3cd17cf554df
author Chong Zhang <chz@google.com> Mon Apr 08 21:51:46 2019 +0000
committer Chong Zhang <chz@google.com> Mon Apr 08 14:56:30 2019 -0700
tree cb9fb49616e0ff7890359f7eefb6563d25426934
parent 8d14f5ccff2440f39630965486e9601ab6d007b6

Revert "Revert "Remove direct libgui reference from omx server side""

This reverts commit b4979c59d93a6ca2be7e65489fc39896bfdc2c96.

Reason for revert: reland with fixes:
1) make OMXHarness use OMXClient, not directly IOMX wrappers.
2) fix ref of consumer listener interface in GraphicBufferSource.

bug: 129272021
Test: camera recording, aosp_x86 build

Change-Id: Idaaaf412c65cbe89c95a2cb54f3833ff1fc4c304

media/ndk/NdkImageReader.cpp

diff --git a/media/ndk/NdkImageReader.cpp b/media/ndk/NdkImageReader.cpp
index 22e15d3..baa4fc7 100644
--- a/media/ndk/NdkImageReader.cpp
+++ b/media/ndk/NdkImageReader.cpp
@@ -29,7 +29,7 @@
 #include <ui/PublicFormat.h>
 #include <private/android/AHardwareBufferHelpers.h>
 #include <grallocusage/GrallocUsageConversion.h>
-#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
+#include <gui/bufferqueue/1.0/WGraphicBufferProducer.h>
 
 using namespace android;