From e0ca4347beb2e2e7235e16c4555d426c7d923468 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 14 Jul 2014 19:03:45 +0200
Subject: [PATCH] Android: generate icon from SVG

---
 Makefile.am                   |  11 ++++++++---
 android/res/drawable/icon.png | Bin 2931 -> 0 bytes
 2 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 android/res/drawable/icon.png

diff --git a/Makefile.am b/Makefile.am
index 7f9ef3e93..23b5201b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -276,8 +276,9 @@ libmpd.so: $(filter %.a,$(src_mpd_LDADD)) libmain.a
 
 android/build/build.xml: android/AndroidManifest.xml
 	rm -rf android/build
-	mkdir -p android/build/include
-	ln -s $(srcdir)/android/AndroidManifest.xml $(srcdir)/android/custom_rules.xml $(srcdir)/android/src $(srcdir)/android/res android/build
+	mkdir -p android/build/include android/build/res
+	ln -s $(srcdir)/android/AndroidManifest.xml $(srcdir)/android/custom_rules.xml $(srcdir)/android/src android/build
+	ln -s $(srcdir)/android/res/values android/build/res
 	$(ANDROID_SDK)/tools/android update project --path android/build --target android-17
 
 android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java android/build/build.xml
@@ -293,7 +294,11 @@ android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml
 	rm -f $@
 	$(STRIP) -o $@ $<
 
-android/build/bin/Main-debug.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so
+android/build/res/drawable/icon.png: mpd.svg
+	mkdir -p $(@D)
+	rsvg-convert --width=48 --height=48 $< -o $@
+
+android/build/bin/Main-debug.apk: android/build/build.xml android/build/res/drawable/icon.png android/build/libs/armeabi-v7a/libmpd.so
 	cd android/build && ant nodeps debug
 
 android/build/bin/Main-release-unsigned.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so
diff --git a/android/res/drawable/icon.png b/android/res/drawable/icon.png
deleted file mode 100644
index dd23fb895d79ca132e719368451b123b85da001f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2931
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
XM*M$*7ndL(jR4#>GKbX~x;*|5XbEu4