commit 9f20767f61e5646cc70f361ce23839e924881358
author Pawin Vongmasa <pawin@google.com> Fri Aug 18 23:43:45 2017 -0700
committer Pawin Vongmasa <pawin@google.com> Fri Sep 01 16:24:17 2017 -0700
tree 9eff2d745a057ff0b1a59f5bcf91a0f9cf27f5e6
parent 5f8047b026702c98a19cc184d8400398d0c21556

Fix header dependencies

This is needed because
1. MediaCodecsXmlParser.h will not include OMX header files.
2. libstagefright will not export "." as an include directory.

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

Test: make cts -j123 && cts-tradefed run cts -m \
CtsMediaTestCases -t android.media.cts.MediaCodecListTest

Bug: 37657124

Merged-In: I63d83346b22c45cc5954d41f2c23d7acd496b2ca
Change-Id: I63d83346b22c45cc5954d41f2c23d7acd496b2ca

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index b420645..010b5a4 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -190,12 +190,15 @@
         */
     ],
 
-    include_dirs: [
-        "frameworks/native/include/media/openmax",
+    header_libs: [
+        "libOpenSLES_headers",
+        "media_plugin_headers",
     ],
 
-    header_libs: ["libOpenSLES_headers"],
-    export_header_lib_headers: ["libOpenSLES_headers"],
+    export_header_lib_headers: [
+        "libOpenSLES_headers",
+        "media_plugin_headers",
+    ],
 
     static_libs: [
         "libopensles_helper",
@@ -219,6 +222,11 @@
 
         "libstagefright_http_support",
     ],
+
+    include_dirs: [
+        "frameworks/av/media/libstagefright/mpeg2ts",
+    ],
+
     export_shared_lib_headers: [
         "libmedia",
         "libstagefright",

src/android/VideoCodec_to_android.cpp

diff --git a/src/android/VideoCodec_to_android.cpp b/src/android/VideoCodec_to_android.cpp
index ce0d0d6..b0d4c6f 100644
--- a/src/android/VideoCodec_to_android.cpp
+++ b/src/android/VideoCodec_to_android.cpp
@@ -16,6 +16,7 @@
 
 #include "sles_allinclusive.h"
 
+#include <media/openmax/OMX_Types.h>
 #include <media/stagefright/MediaCodecList.h>
 #include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/SimpleDecodingSource.h>

src/android/android_StreamPlayer.cpp

diff --git a/src/android/android_StreamPlayer.cpp b/src/android/android_StreamPlayer.cpp
index 852a3ee..afb9b2e 100644
--- a/src/android/android_StreamPlayer.cpp
+++ b/src/android/android_StreamPlayer.cpp
@@ -24,7 +24,7 @@
 #include <media/stagefright/foundation/ADebug.h>
 #include <binder/IPCThreadState.h>
 
-#include "mpeg2ts/ATSParser.h"
+#include <ATSParser.h>
 
 //--------------------------------------------------------------------------------------------------
 namespace android {