sync with upstream

1 files changed, 2 insertions, 15 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
index 46e34a6..fb0c15f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
@@ -29,12 +29,8 @@
 
 typedef void* ADSPHANDLE;
 
-#ifdef _WIN32
-#define ADSP_HELPER_DLL "\\library.kodi.adsp\\libKODI_adsp" ADDON_HELPER_EXT
-#else
-#define ADSP_HELPER_DLL_NAME "libKODI_adsp-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
-#define ADSP_HELPER_DLL "/library.kodi.adsp/" ADSP_HELPER_DLL_NAME
-#endif
+#define ADSP_HELPER_DLL KODI_DLL("adsp")
+#define ADSP_HELPER_DLL_NAME KODI_DLL_NAME("adsp")
 
 class CAddonSoundPlay;
 
@@ -69,15 +65,6 @@ public:
     libBasePath  = ((cb_array*)m_Handle)->libPath;
     libBasePath += ADSP_HELPER_DLL;
 
-#if defined(ANDROID)
-      struct stat st;
-      if(stat(libBasePath.c_str(),&st) != 0)
-      {
-        std::string tempbin = getenv("XBMC_ANDROID_LIBS");
-        libBasePath = tempbin + "/" + ADSP_HELPER_DLL_NAME;
-      }
-#endif
-
     m_libKODI_adsp = dlopen(libBasePath.c_str(), RTLD_LAZY);
     if (m_libKODI_adsp == NULL)
     {