Merge pull request #601 from glennguy/android-search-paths

Change decrypter search path for Android
xbmc · Apr 10, 2021 · e8f2106 · e8f2106
2 parents 8887378 + 732d850
commit e8f2106
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,11 +86,7 @@ else()
   set(ADP_ADDITIONAL_BINARY $<TARGET_FILE:ssd_wv>)
 endif()
 
-if(CORE_SYSTEM_NAME STREQUAL android)
-  set(DECRYPTERPATH "special://xbmcbinaddons")
-else()
-  set(DECRYPTERPATH "special://home/cdm")
-endif()
+set(DECRYPTERPATH "special://home/cdm")
 
 list(APPEND DEPLIBS bento4)
 list(APPEND DEPLIBS mpegts)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(version: "Matrix", deploy: ['osx-x86_64', 'windows-i686', 'windows-x86_64', 'ubuntu-ppa'])
+buildPlugin(version: "Matrix")
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# inputstream.adaptive (2.6.6)
+# inputstream.adaptive (2.6.12)
 
 This is an adaptive file addon for kodi's new InputStream Interface.
 

diff --git a/inputstream.adaptive/addon.xml.in b/inputstream.adaptive/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.adaptive"
-  version="2.6.11"
+  version="2.6.12"
   name="InputStream Adaptive"
   provider-name="peak3d">
   <requires>@ADDON_DEPENDS@</requires>
@@ -19,6 +19,9 @@
     <description lang="es_ES">Cliente InputStream para flujo de datos adaptativos</description>
     <platform>@PLATFORM@</platform>
     <news>
+v2.6.12 (2021-04-09)
+- Remove Android specific decrypter search paths
+
 v2.6.11 (2021-04-08)
 - Fix ampersand in changelog causing issues from v2.6.9 and v2.6.10
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -2137,14 +2137,8 @@ void Session::GetSupportedDecrypterURN(std::string& key_system)
   kodihost->SetLibraryPath(kodi::vfs::TranslateSpecialProtocol(specialpath).c_str());
 
   std::vector<std::string> searchPaths(2);
-#ifdef ANDROID
-  searchPaths[0] = getenv("KODI_ANDROID_LIBS")
-                       ? getenv("KODI_ANDROID_LIBS")
-                       : kodi::vfs::TranslateSpecialProtocol("special://xbmcbinaddons/");
-#else
   searchPaths[0] =
       kodi::vfs::TranslateSpecialProtocol("special://xbmcbinaddons/inputstream.adaptive/");
-#endif
   searchPaths[1] = kodi::GetAddonInfo("path");
 
   std::vector<kodi::vfs::CDirEntry> items;