Enable video playback in omx-components

Change-Id: If998eacbb55b768bcdb7ad8b9422013111aac557
Signed-off-by: Liu, Shuo <shuo.liu@intel.com>
diff --git a/Android.mk b/Android.mk
index e91b94b..5b46e8d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,13 +5,18 @@
 
 VENDORS_INTEL_MRST_COMPONENTS_ROOT := $(LOCAL_PATH)
 
-$(call add-prebuilt-files, ETC, wrs_omxil_components.list)
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/wrs_omxil_components.list:system/etc/wrs_omxil_components.list
+#$(call add-prebuilt-files, ETC, wrs_omxil_components.list)
 
 WRS_OMXIL_CORE_ROOT := hardware/intel/wrs_omxil_core
 
 GLIB_TOP := hardware/intel/glib
-
-PV_TOP := external/opencore
+LIBVA_TOP := hardware/intel/libva
+LIBINFODUMP_TOP := hardware/intel/omx-components/libinfodump
+LIBBASECODEC_TOP:= hardware/intel/omx-components/libbasecodec
+#PV_TOP := external/opencore
+ifeq (1,0)
 PV_INCLUDES := \
 	$(PV_TOP)/android \
 	$(PV_TOP)/extern_libs_v2/khronos/openmax/include \
@@ -28,11 +33,23 @@
 	$(PV_TOP)/android/drm/oma1/src \
 	$(PV_TOP)/build_config/opencore_dynamic \
 	$(TARGET_OUT_HEADERS)/libpv
-
+endif
 # mrst sst audio
--include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/sst/Android.mk
+#-include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/sst/Android.mk
 
-# poulsbo
--include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/psb/Android.mk
+COMPONENT_USE_BUFFERSHARING := false
+
+#intel video decoders
+include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/psb/Android.mk
+
+#intel video encoders
+include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/libinfodump/Android.mk
+include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/libbasecodec/Android.mk
+include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/omx_m4venc/Android.mk
+include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/omx_avcenc/Android.mk
+include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/omx_h263enc/Android.mk
+
+#intel audio codecs
+#-include $(VENDORS_INTEL_MRST_COMPONENTS_ROOT)/sst-stub-base/Android.mk
 
 endif #BOARD_USES_MRST_OMX