RIO-7791: Fix for deadlock between player engine and OMX component threads caused...

[android-x86/external-opencore.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index ccbf92b..2c897f8 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -6,8 +6,6 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/Config.mk
 
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_common.mk
-include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_author.mk
-include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_player.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_avcdec_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_m4vdec_sharedlibrary.mk
@@ -18,19 +16,24 @@ include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_avcenc_sharedlibrary
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_m4venc_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_amrenc_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_net_support.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_player.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_downloadreg.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_download.mk
-include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_rtspreg.mk
-include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_rtsp.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_streamingreg.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_streaming.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_mp4localreg.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_mp4local.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_pvoma1passthru.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_rtsp.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_pvrtspunicast_streaming.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_pvrtspunicast_streamingreg.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_pvrtsptunicast_streaming.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_pvrtsptunicast_streamingreg.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_author.mk
+include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_pvme.mk
 ifeq ($(BUILD_PV_2WAY),1)
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_2way.mk
 endif
-ifeq ($(BUILD_PV_ME),1)
-include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_pvme.mk
-endif
 include $(PV_TOP)/oscl/unit_test/Android.mk
 ifeq ($(BUILD_PV_TEST_APPS),1)
 include $(PV_TOP)/engines/player/test/Android.mk
@@ -38,12 +41,11 @@ include $(PV_TOP)/engines/author/test/Android.mk
 include $(PV_TOP)/engines/2way/sample_app/command_line/Android.mk
 include $(PV_TOP)/codecs_v2/omx/omx_testapp/Android.mk
 include $(PV_TOP)/codecs_v2/omx/omx_testapp_enc/Android.mk
+include $(PV_TOP)/engines/pvme/test/Android.mk
 ifeq ($(BUILD_PV_2WAY),1)
 include $(PV_TOP)/engines/2way/test/Android.mk
 endif
-ifeq ($(BUILD_PV_ME),1)
-include $(PV_TOP)/engines/pvme/test/Android.mk
-endif
 endif
+-include $(PV_TOP)/extern_libs_v2/android/extended_features/Android.mk
 
 endif