diff options
| author | Wolfgang Schupp <wsnipex@a1.net> | 2022-06-16 15:39:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 15:39:35 +0200 |
| commit | edbad85655689f452a3642ebee09aedd384ef25c (patch) | |
| tree | e994a62932b55d59aa4d29859b950b2f45a64400 | |
| parent | 0778a7ede7717e077ec6fd09a751ad09370abf0a (diff) | |
| parent | 30736e18cf67bf90848fbee79e2456eb457c909f (diff) | |
Merge pull request #21561 from wsnipex/fix-cryptodome
[android] packaging: don't delete cryptodome libraries from depends i…
| -rw-r--r-- | tools/android/packaging/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 459939f2bc..9c9ab0b02a 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -91,7 +91,7 @@ sharedobb: shared python: | xbmc/assets mkdir -p xbmc/assets/python@PYTHON_VERSION@/lib/ cp -rfp $(PREFIX)/lib/python@PYTHON_VERSION@ xbmc/assets/python@PYTHON_VERSION@/lib/ - cd xbmc/assets/python@PYTHON_VERSION@/lib/python@PYTHON_VERSION@/; rm -rf test config lib-dynload + cd xbmc/assets/python@PYTHON_VERSION@/lib/python@PYTHON_VERSION@/; rm -rf test config lib-dynload ; find . -name "*.so" -exec rm -f {} \; res: mkdir -p xbmc/res xbmc/res/raw xbmc/res/values images @@ -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/python@PYTHON_VERSION@/site-packages; for i in `find Cryptodome -name \*.so` ; do FN=`echo $$i | cut -c1- | tr "/" "_" | sed -e 's/\.cpython-[0-9]\{2\}-x86_64-linux-gnu\./\./g'` ;mv $$i $$DIR/xbmc/obj/local/$(CPU)/$$FN ; done + DIR=${CURDIR}; cd $(PREFIX)/lib/python@PYTHON_VERSION@/site-packages; for i in `find Cryptodome -name \*.so` ; do FN=`echo $$i | cut -c1- | tr "/" "_" | sed -e 's/\.cpython-[0-9]\{2\}-x86_64-linux-gnu\./\./g'` ;cp $$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 |