commit 8cb439a0dd0cf7c8d7b7fb8ebd617e7e2e7fc020
author Lajos Molnar <lajos@google.com> Thu Nov 20 06:46:04 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 20 06:46:05 2014 +0000
tree 6886c173b933ead6193ba761fba1cfb59e27e395
parent 7714658d7847c322410d6407ed2c360a2051ea96
parent 490aba96990b012e67e093164b57e40bb3858db9

Merge "Enable ISV OMX core." into lmp-mr1-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index db48934..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

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)