finish mipmap move

vanilla-music · May 21, 2018 · e5c8de0 · e5c8de0
1 parent 66ead15
commit e5c8de0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ release: clean
 	ssh qemu '. .bash_aliases && cd /hostfs/vanilla && ./gradlew assembleRelease && cd ./app/build/outputs/apk/release && zipalign -v -p 4 app-release-unsigned.apk aligned.apk && /home/adrian/Android/build-tools/26.0.1/apksigner sign -ks /hostfs/.android.keystore --out final.apk aligned.apk'
 
 clean:
-	rm -rf ./app/build/outputs
+	rm -rf ./app/build
 
 uninstall:
 	adb uninstall ch.blinkenlights.android.vanilla
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 	<application
 		android:resizeableActivity="true"
-		android:icon="@drawable/icon"
+		android:icon="@mipmap/icon"
 		android:label="@string/app_name">
 
 		<meta-data

diff --git a/generate-pngs.sh b/generate-pngs.sh
@@ -37,5 +37,8 @@ for i in orig/mipmap/*.svgz; do
 	gen mipmap "$i" xhdpi 192
 	gen mipmap "$i" xxhdpi 288
 done
+
 # GOOG tells us to use xxx-hdpi only for launcher icons
-gen mipmap "orig/mipmap/icon.svgz" xxxhdpi 384
+for i in orig/mipmap/ic*.svgz ; do
+	gen mipmap "$i" xxxhdpi 384
+done