[droid] new launcher icons + fetch launcher icons from media dir

[vuplus_xbmc] / tools / android / packaging / Makefile

diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile
index 5416cf6..1fe3de8 100644 (file)
--- a/tools/android/packaging/Makefile
+++ b/tools/android/packaging/Makefile
@@ -5,7 +5,7 @@ OBJS = libcurl.so \
   libafpclient.so  \
   libplist.so libshairplay.so \
   libxbogg.so libxbvorbis.so libxbvorbisfile.so libxbFLAC.so libxbmpeg2.so \
-  libxbmpeg2convert.so libnfs.so libass.so
+  libxbmpeg2convert.so libnfs.so libass.so libbluray.so
 
 PLATFORM_OBJS =
 EXCLUDED_ADDONS = screensaver.rsxs.euphoria visualization.dxspectrum visualization.milkdrop visualization.projectm
@@ -68,16 +68,22 @@ package: extras
        @echo "$(XBMCROOT)/xbmcapp-$(CPU)-debug.apk created"
 
 extras: libs
-       rm -rf xbmc/assets/python2.6/lib/
+       rm -rf xbmc/assets
        mkdir -p xbmc/assets xbmc/res xbmc/res/raw xbmc/assets/python2.6/lib/
        cp -rfp $(PREFIX)/share/xbmc/* ./xbmc/assets
        find `pwd`/xbmc/assets/ -depth -name ".git" -exec rm -rf {} \;
        find `pwd`/xbmc/assets/system/ -name "*.so" -exec rm {} \;
        find `pwd`/xbmc/assets/addons/skin.*/media/* -depth -not -iname "Textures.xbt" -exec rm -rf {} \;
+       find `pwd`/xbmc/assets/system/keymaps/ -depth -name "joystick*.xml" ! -name "joystick.xml" -exec rm {} \;
        @echo "native_arch=$(ARCH)" > xbmc/res/raw/xbmc.properties
        cd xbmc/assets/addons; rm -rf $(EXCLUDED_ADDONS)
        cp -rfp $(PREFIX)/lib/python2.6 xbmc/assets/python2.6/lib/
-       cp -rfp $(XBMCROOT)/media/Splash.png xbmc/res/drawable/splash.png
+       cp -fp $(XBMCROOT)/media/Splash.png xbmc/res/drawable/splash.png
+       cp -fp media/drawable-hdpi/ic_launcher.png xbmc/res/drawable-hdpi/ic_launcher.png
+       cp -fp media/drawable-ldpi/ic_launcher.png xbmc/res/drawable-ldpi/ic_launcher.png
+       cp -fp media/drawable-mdpi/ic_launcher.png xbmc/res/drawable-mdpi/ic_launcher.png
+       cp -fp media/drawable-xhdpi/ic_launcher.png xbmc/res/drawable-xhdpi/ic_launcher.png
+       cp -fp media/drawable-xxhdpi/ic_launcher.png xbmc/res/drawable-xxhdpi/ic_launcher.png
        cd xbmc/assets/python2.6/lib/python2.6/; rm -rf test config lib-dynload
        mkdir -p tmp/res; $(AAPT) c -S xbmc/res -C tmp/res; cp -r -n xbmc/res tmp/ || true
        $(AAPT) p -f -I $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar -S tmp/res/ -M xbmc/AndroidManifest.xml -F images/xbmcapp-debug-skeleton.apk -J xbmc/src
@@ -96,7 +102,7 @@ libs: $(PREFIX)/lib/xbmc/libxbmc.so
        install -p $(GDBPATH) ./xbmc/libs/$(CPU)/gdbserver
        echo "set solib-search-path ./obj/local/$(CPU)" > ./xbmc/libs/$(CPU)/gdb.setup
        echo "directory $(TOOLCHAIN)/sysroot/usr/include $(NDKROOT)/sources/android/native_app_glue" \
-            "$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/include/$(GCC_VERSION) $(XBMCROOT)  $(PREFIX)/include jni" >> ./xbmc/libs/$(CPU)/gdb.setup
+            "$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/include $(XBMCROOT)  $(PREFIX)/include jni" >> ./xbmc/libs/$(CPU)/gdb.setup
        cp -fp xbmc/libs/$(CPU)/* xbmc/lib/$(CPU)
 
 $(PREFIX)/lib/xbmc/libxbmc.so: $(SRCLIBS)
@@ -120,8 +126,8 @@ clean:
        rm -rf xbmc/obj
        rm -rf xbmc/res/raw
        rm -rf tmp
-       rm xbmc/res/drawable/splash.png
-       rm xbmc/src/R.java
-       rm xbmc/classes.dex
+       rm -f xbmc/res/drawable/splash.png
+       rm -f xbmc/src/R.java
+       rm -f xbmc/classes.dex
 
 .PHONY: arm armeabi-v7a x86 force extras libs