commit 4c7a5b9d96c16e31a233549ff2d2ddb92d58540c
author Pawin Vongmasa <pawin@google.com> Fri Mar 30 18:53:29 2018 -0700
committer Pawin Vongmasa <pawin@google.com> Sat Apr 07 01:08:28 2018 -0700
tree 3398bc9a5bcb530240eec03d586a5c0ef49f4da4
parent c7e85481ec848d4ae91a96fc6ddcec76a5d8de20

Prevent NOT_ENOUGH_DATA from entering HIDL

Test: Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 70527635
Change-Id: I06defaded09f2bdac3a6ac48a48cf25cb211a672

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 3990e69..9d9ac8c 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -3,10 +3,12 @@
     vendor_available: true,
     export_include_dirs: ["include"],
     header_libs:[
+        "libgui_headers",
         "libstagefright_headers",
         "media_plugin_headers",
     ],
     export_header_lib_headers: [
+        "libgui_headers",
         "libstagefright_headers",
         "media_plugin_headers",
     ],
@@ -192,6 +194,14 @@
         export_aidl_headers: true,
     },
 
+    header_libs: [
+        "libstagefright_headers",
+    ],
+
+    export_header_lib_headers: [
+        "libstagefright_headers",
+    ],
+
     shared_libs: [
         "liblog",
         "libcutils",