Remove Android specific decrypter search paths

xbmc · Apr 9, 2021 · 40f4429 · 40f4429
1 parent 8887378
commit 40f4429
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 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/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;