commit b4979c59d93a6ca2be7e65489fc39896bfdc2c96
author Sung-fang Tsai <sungfang@google.com> Sun Apr 07 00:29:22 2019 +0000
committer Victor Chang <vichang@google.com> Mon Apr 08 10:32:03 2019 +0000
tree 3da5a8d97ee8f37f4f480ad80104b6f77d3bcd87
parent 482f60ccccc12e6afe24f9ba503496ce65d1ba43

Revert "Remove direct libgui reference from omx server side"

This reverts commit 482f60ccccc12e6afe24f9ba503496ce65d1ba43.

Reason for revert: b/130058749 camera recording hang

Bug: 130058749
Change-Id: I358bc9c62c48328c01c8611c7e6f77d16affff54

media/ndk/Android.bp

diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 7d1c88b..a4f5730 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -81,6 +81,7 @@
         "libmediadrm",
         "libstagefright",
         "libstagefright_foundation",
+        "libstagefright_bufferqueue_helper",
         "liblog",
         "libutils",
         "libcutils",

media/ndk/NdkImageReader.cpp

diff --git a/media/ndk/NdkImageReader.cpp b/media/ndk/NdkImageReader.cpp
index baa4fc7..22e15d3 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 <gui/bufferqueue/1.0/WGraphicBufferProducer.h>
+#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
 
 using namespace android;