release-request-108343c4-ad88-44f9-aaa2-24d8b8a5c176-for-git_oc-mr1-release-4321077 snap-temp-L97000000100182150
Change-Id: I22f3362fa654ed184436565aa24bd2564f724d26
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",
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>
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 {
