commit 48616156f80645f6a751f52c0f12d2e4a914c2b4
author Pawin Vongmasa <pawin@google.com> Thu Feb 21 06:28:10 2019 -0800
committer Pawin Vongmasa <pawin@google.com> Tue Mar 19 06:52:35 2019 -0700
tree 350fa534853421b6b92206859b746f05fbc88692
parent 60c73a445b632cc2e233b1a275efeee7414a41a4

Export libgui headers from media modules

libstagefright, libmedia_ndk and libmedia_omx

Also, fix the reference to HGraphicBufferProducer in
AImageReaderWindowHandleTest.

Test: Builds

Bug: 112508112
Change-Id: I2ce0e4fd395a0c733aaf98b7397d7183c7475672

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 9799cad..a51a2cf 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -86,6 +86,7 @@
     export_shared_lib_headers: [
         "android.hidl.token@1.0-utils",
         "android.hardware.media.omx@1.0",
+        "libgui",
         "libstagefright_foundation",
         "libui",
     ],

media/libstagefright/Android.bp

diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index d8b825d..dc51b16 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -225,6 +225,7 @@
     ],
 
     export_shared_lib_headers: [
+        "libgui",
         "libmedia",
         "android.hidl.allocator@1.0",
     ],

media/ndk/Android.bp

diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index f9f1acc..f4cc704 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -101,6 +101,10 @@
 
     export_include_dirs: ["include"],
 
+    export_shared_lib_headers: [
+        "libgui",
+    ],
+
     product_variables: {
         pdk: {
             enabled: false,

media/ndk/tests/AImageReaderWindowHandleTest.cpp

diff --git a/media/ndk/tests/AImageReaderWindowHandleTest.cpp b/media/ndk/tests/AImageReaderWindowHandleTest.cpp
index 5f11252..5b65064 100644
--- a/media/ndk/tests/AImageReaderWindowHandleTest.cpp
+++ b/media/ndk/tests/AImageReaderWindowHandleTest.cpp
@@ -27,6 +27,8 @@
 
 namespace android {
 
+using HGraphicBufferProducer = hardware::graphics::bufferqueue::V1_0::
+        IGraphicBufferProducer;
 using hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer;
 using aimg::AImageReader_getHGBPFromHandle;