Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: Id93fd29ca58e92fcde87904b176f544df5c9a428
diff --git a/Android.mk b/Android.mk
index a6596b0..b8f66c3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,10 @@
LOCAL_CFLAGS += -DUSE_MEDIASDK
endif
+ifeq ($(TARGET_HAS_ISV), true)
+LOCAL_CFLAGS +=-DTARGET_HAS_ISV
+endif
+
LOCAL_C_INCLUDES:= \
$(call include-path-for, frameworks-native)/media/hardware \
$(call include-path-for, frameworks-native)/media/openmax
@@ -24,7 +28,6 @@
libbinder \
libutils \
libcutils \
- libui \
libdl \
libstagefright_foundation
diff --git a/WrsOMXPlugin.cpp b/WrsOMXPlugin.cpp
index f9c62e2..ee76ffe 100644
--- a/WrsOMXPlugin.cpp
+++ b/WrsOMXPlugin.cpp
@@ -45,10 +45,14 @@
WrsOMXPlugin::WrsOMXPlugin()
{
+#ifdef TARGET_HAS_ISV
+ AddCore("libisv_omx_core.so");
+#else
AddCore("libwrs_omxil_core_pvwrapped.so");
#if defined(USE_MEDIASDK)
AddCore("libmfx_omx_core.so");
#endif
+#endif
}
OMX_ERRORTYPE WrsOMXPlugin::AddCore(const char* coreName)