diff options
| author | Markus Pfau <pfau@peak3d.de> | 2020-06-23 19:08:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 19:08:02 +0200 |
| commit | c14c684d0636d40c3927f09b646f9916cc40b143 (patch) | |
| tree | 358e09425976eb5224b7b5d069953a64aa54ade7 | |
| parent | c9847530029f9d82bdf3d766194a452ceef8adde (diff) | |
| parent | 205fd2884b3b9d1c399ee6789acd5c76ca2dd546 (diff) | |
Merge pull request #18092 from peak3d/pycache
[Android] Move PYTHON into cache folder
| -rw-r--r-- | tools/android/packaging/xbmc/src/Splash.java.in | 2 | ||||
| -rw-r--r-- | xbmc/platform/android/activity/XBMCApp.cpp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tools/android/packaging/xbmc/src/Splash.java.in b/tools/android/packaging/xbmc/src/Splash.java.in index 6b0ec1a496..4cbe9ca6a7 100644 --- a/tools/android/packaging/xbmc/src/Splash.java.in +++ b/tools/android/packaging/xbmc/src/Splash.java.in @@ -416,8 +416,6 @@ public class Splash extends Activity if (!(sName.startsWith("assets/") || (mInstallLibs && sName.startsWith("lib/")))) continue; - if (sName.startsWith("assets/python")) - continue; String sFullPath = null; if (sName.startsWith("lib/")) diff --git a/xbmc/platform/android/activity/XBMCApp.cpp b/xbmc/platform/android/activity/XBMCApp.cpp index 123fa06e52..755254fb22 100644 --- a/xbmc/platform/android/activity/XBMCApp.cpp +++ b/xbmc/platform/android/activity/XBMCApp.cpp @@ -1360,9 +1360,8 @@ void CXBMCApp::SetupEnv() else setenv("HOME", getenv("KODI_TEMP"), 0); - std::string apkPath = getenv("KODI_ANDROID_APK"); - apkPath += "/assets/python3.7"; - setenv("PYTHONHOME", apkPath.c_str(), 1); + std::string pythonPath = cacheDir + "/apk/assets/python3.7"; + setenv("PYTHONHOME", pythonPath.c_str(), 1); setenv("PYTHONPATH", "", 1); setenv("PYTHONOPTIMIZE","", 1); setenv("PYTHONNOUSERSITE", "1", 1); |