diff options
| author | Chris Browet <koying@semperpax.com> | 2015-04-06 11:35:22 +0200 |
|---|---|---|
| committer | Chris Browet <koying@semperpax.com> | 2015-04-06 11:35:22 +0200 |
| commit | a9450a4fe291f5f372b61551b91fb5912f0db26d (patch) | |
| tree | 08d405ce99001a1a4ad041c666cff560790fc198 | |
| parent | b6e3f5086ac958a37daaf1cf1491762a2ce3dc24 (diff) | |
| parent | 18d00b34f4d7e7a2a426f8e9a7359122c3855b73 (diff) | |
Merge pull request #6886 from koying/fixdroidaddonpack
Fixdroidaddonpack
| -rw-r--r-- | tools/android/packaging/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 26f8ff8384..339636d645 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -87,7 +87,7 @@ shared: find `pwd`/assets/addons/skin.*/media/* -depth -not -iname "Textures.xbt" -exec rm -rf {} \; find `pwd`/assets/system/keymaps/ -depth -name "joystick*.xml" ! -name "joystick.xml" -exec rm {} \; mv -f `pwd`/assets/system/keymaps/joystick.xml.sample `pwd`/assets/system/keymaps/joystick.xml - cd assets; rm -rf $(EXCLUDED_ADDONS) + cd `pwd`/assets/addons; rm -rf $(EXCLUDED_ADDONS) sharedapk: shared | xbmc/assets cp -rfp assets/* ./xbmc/assets @@ -125,6 +125,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so find $(PREFIX)/lib/@APP_NAME_LC@/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; find $(PREFIX)/share/@APP_NAME_LC@/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; find $(PREFIX)/lib/@APP_NAME_LC@/system -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; + find $(PREFIX)/share/@APP_NAME_LC@/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; 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 |