diff options
| author | Arpit Nandwani <arpit.nandwani@gmail.com> | 2017-08-20 17:35:02 +0530 |
|---|---|---|
| committer | Jim Carroll <git@dempsy.net> | 2019-10-11 22:46:08 +0300 |
| commit | e06f15ab352db1180ddf01109270e293dc0d5988 (patch) | |
| tree | ea0d581c638fbcdf32473425fc061e779dba458a /tools | |
| parent | 52a284420de47335b427566dc0621646c891a7fc (diff) | |
Added Android Fix
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/packaging/Makefile.in | 10 | ||||
| -rw-r--r-- | tools/android/packaging/xbmc/src/Splash.java.in | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index ab73218579..53ec860597 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -89,9 +89,9 @@ sharedobb: shared @echo "$(CMAKE_SOURCE_DIR)/main.@APP_NAME_LC@.obb created" python: | xbmc/assets - mkdir -p xbmc/assets/python2.7/lib/ - cp -rfp $(PREFIX)/lib/python2.7 xbmc/assets/python2.7/lib/ - cd xbmc/assets/python2.7/lib/python2.7/; rm -rf test config lib-dynload + mkdir -p xbmc/assets/python3.7/lib/ + cp -rfp $(PREFIX)/lib/python3.7 xbmc/assets/python3.7/lib/ + cd xbmc/assets/python3.7/lib/python3.7/; rm -rf test config lib-dynload res: mkdir -p xbmc/res xbmc/res/raw xbmc/res/values images @@ -112,7 +112,7 @@ res: libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so rm -rf xbmc/lib/$(CPU) xbmc/obj/local/$(CPU) - mkdir -p xbmc/lib/$(CPU) xbmc/assets/python2.7/lib/ xbmc/obj/local/$(CPU) + mkdir -p xbmc/lib/$(CPU) xbmc/assets/python3.7/lib/ xbmc/obj/local/$(CPU) cp -fpL $(SRCLIBS) xbmc/obj/local/$(CPU)/ cp -fp $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so xbmc/obj/local/$(CPU)/ find $(PREFIX)/lib/@APP_NAME_LC@/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; || true @@ -120,7 +120,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so find $(DEPENDS_PATH)/share/kodi/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; || true find $(DEPENDS_PATH)/lib/kodi/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; || true find $(PREFIX)/lib/@APP_NAME_LC@/system -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; - DIR=${CURDIR}; cd $(PREFIX)/lib/python2.7/site-packages; for i in `find Cryptodome -name \*.so` ; do FN=`echo $$i | cut -c1- | tr "/" "_"` ; mv $$i $$DIR/xbmc/obj/local/$(CPU)/$$FN ; done + DIR=${CURDIR}; cd $(PREFIX)/lib/python3.7/site-packages; for i in `find Cryptodome -name \*.so` ; do FN=`echo $$i | cut -c1- | tr "/" "_"` ; mv $$i $$DIR/xbmc/obj/local/$(CPU)/$$FN ; done cd xbmc/obj/local/$(CPU)/; find . -name "*.so" -not -name "lib*.so" | sed "s/\.\///" | xargs -I@ mv @ lib@ cp -fp xbmc/obj/local/$(CPU)/*.so xbmc/lib/$(CPU)/ $(STRIP) --strip-unneeded xbmc/lib/$(CPU)/*.so diff --git a/tools/android/packaging/xbmc/src/Splash.java.in b/tools/android/packaging/xbmc/src/Splash.java.in index 4cf3345b71..6b0ec1a496 100644 --- a/tools/android/packaging/xbmc/src/Splash.java.in +++ b/tools/android/packaging/xbmc/src/Splash.java.in @@ -416,7 +416,7 @@ public class Splash extends Activity if (!(sName.startsWith("assets/") || (mInstallLibs && sName.startsWith("lib/")))) continue; - if (sName.startsWith("assets/python2.7")) + if (sName.startsWith("assets/python")) continue; String sFullPath = null; |