commit de43870f93ff25b26549142aad0c1f8756316d96
author Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:49 2015 +0530
committer Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:49 2015 +0530
tree 6886c173b933ead6193ba761fba1cfb59e27e395
parent 419d34016dceec65ea137490668984eb80119df4
parent 8cb439a0dd0cf7c8d7b7fb8ebd617e7e2e7fc020

Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Id93fd29ca58e92fcde87904b176f544df5c9a428

Android.mk

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
 

WrsOMXPlugin.cpp

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)