From 1468646aa5d6cbfca398586fa4b9f24338e54043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Fern=C3=A1ndez?= Date: Fri, 13 Nov 2020 00:50:24 +0100 Subject: [PATCH] Android bundle update (#6870) - adaptative icons - minify + shrink - remove unused assets to save a few KBs - install apk by clicking on notification after download (doesn't apply to F-Droid) --- Makefile | 18 ++++++++++++++++-- l10n | 2 +- platform/android/luajit-launcher | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 15012bec1..68a80d011 100644 --- a/Makefile +++ b/Makefile @@ -358,14 +358,28 @@ androidupdate: all # assets are compressed manually and stored inside the APK. cd $(INSTALL_DIR)/koreader && 7z a -l -mx=9 -mfb=256 -mmt=on \ ../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).zip * \ + -xr!*cache$ \ + -xr!*clipboard$ \ + -xr!*data/dict$ \ + -xr!*data/tessdata$ \ + -xr!*history$ \ + -xr!*l10n/templates$ \ + -xr!*ota$ \ -xr!*resources/fonts* \ -xr!*resources/icons/src* \ + -xr!*rocks/bin$ \ + -xr!*rocks/lib/luarocks$ \ + -xr!*screenshots$ \ -xr!*share/man* \ -xr!*spec$ \ + -xr!*tools$ \ -xr!*COPYING$ \ + -xr!*Makefile$ \ + -xr!*NOTES.txt$ \ + -xr!*NOTICE$ \ -xr!*README.md$ \ - -xr!git$ \ - -xr!gitiginore$ + -xr!*koreader.icns$ \ + -xr'!.*' # make the android APK $(MAKE) -C $(ANDROID_LAUNCHER_DIR) $(if $(KODEBUG), debug, release) \ diff --git a/l10n b/l10n index 3238f5499..6d0396d8c 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 3238f5499173264b008167130cd84292bd7218ce +Subproject commit 6d0396d8c100024e6c11c01720daee8443877241 diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher index 0aafdc4c2..95d9d0212 160000 --- a/platform/android/luajit-launcher +++ b/platform/android/luajit-launcher @@ -1 +1 @@ -Subproject commit 0aafdc4c2e318a35fbf997dfc1e40ea58cd73e5c +Subproject commit 95d9d0212108ef3e1bcf88842ee00e8a5925fb98