|
|
@ -17,6 +17,11 @@ IS_RELEASE := $(if $(or $(EMULATE_READER),$(WIN32)),,1)
|
|
|
|
IS_RELEASE := $(if $(or $(IS_RELEASE),$(APPIMAGE),$(DEBIAN),$(MACOS)),1,)
|
|
|
|
IS_RELEASE := $(if $(or $(IS_RELEASE),$(APPIMAGE),$(DEBIAN),$(MACOS)),1,)
|
|
|
|
|
|
|
|
|
|
|
|
ANDROID_ARCH?=arm
|
|
|
|
ANDROID_ARCH?=arm
|
|
|
|
|
|
|
|
ifeq ($(ANDROID_ARCH), x86)
|
|
|
|
|
|
|
|
ANDROID_ABI:=$(ANDROID_ARCH)
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
ANDROID_ABI?=armeabi-v7a
|
|
|
|
|
|
|
|
|
|
|
|
# Use the git commit count as the (integer) Android version code
|
|
|
|
# Use the git commit count as the (integer) Android version code
|
|
|
|
ANDROID_VERSION?=$(shell git rev-list --count HEAD)
|
|
|
|
ANDROID_VERSION?=$(shell git rev-list --count HEAD)
|
|
|
|
ANDROID_NAME?=$(VERSION)
|
|
|
|
ANDROID_NAME?=$(VERSION)
|
|
|
@ -46,6 +51,8 @@ COMMON_DIR=$(PLATFORM_DIR)/common
|
|
|
|
ANDROID_DIR=$(PLATFORM_DIR)/android
|
|
|
|
ANDROID_DIR=$(PLATFORM_DIR)/android
|
|
|
|
ANDROID_LAUNCHER_DIR:=$(ANDROID_DIR)/luajit-launcher
|
|
|
|
ANDROID_LAUNCHER_DIR:=$(ANDROID_DIR)/luajit-launcher
|
|
|
|
ANDROID_ASSETS:=$(ANDROID_LAUNCHER_DIR)/assets/module
|
|
|
|
ANDROID_ASSETS:=$(ANDROID_LAUNCHER_DIR)/assets/module
|
|
|
|
|
|
|
|
ANDROID_LIBS_ROOT:=$(ANDROID_LAUNCHER_DIR)/libs
|
|
|
|
|
|
|
|
ANDROID_LIBS_ABI:=$(ANDROID_LIBS_ROOT)/$(ANDROID_ABI)
|
|
|
|
APPIMAGE_DIR=$(PLATFORM_DIR)/appimage
|
|
|
|
APPIMAGE_DIR=$(PLATFORM_DIR)/appimage
|
|
|
|
CERVANTES_DIR=$(PLATFORM_DIR)/cervantes
|
|
|
|
CERVANTES_DIR=$(PLATFORM_DIR)/cervantes
|
|
|
|
DEBIAN_DIR=$(PLATFORM_DIR)/debian
|
|
|
|
DEBIAN_DIR=$(PLATFORM_DIR)/debian
|
|
|
@ -355,8 +362,8 @@ androidupdate: all
|
|
|
|
-rm $(INSTALL_DIR)/koreader/libs/libluajit.so
|
|
|
|
-rm $(INSTALL_DIR)/koreader/libs/libluajit.so
|
|
|
|
|
|
|
|
|
|
|
|
# fresh APK assets
|
|
|
|
# fresh APK assets
|
|
|
|
rm -rfv $(ANDROID_ASSETS)
|
|
|
|
rm -rfv $(ANDROID_ASSETS) $(ANDROID_LIBS_ROOT)
|
|
|
|
mkdir -p $(ANDROID_ASSETS)
|
|
|
|
mkdir -p $(ANDROID_ASSETS) $(ANDROID_LIBS_ABI)
|
|
|
|
|
|
|
|
|
|
|
|
# APK version
|
|
|
|
# APK version
|
|
|
|
echo $(VERSION) > $(ANDROID_ASSETS)/version.txt
|
|
|
|
echo $(VERSION) > $(ANDROID_ASSETS)/version.txt
|
|
|
@ -364,6 +371,11 @@ androidupdate: all
|
|
|
|
# shared libraries are stored as raw assets
|
|
|
|
# shared libraries are stored as raw assets
|
|
|
|
cp -pR $(INSTALL_DIR)/koreader/libs $(ANDROID_LAUNCHER_DIR)/assets
|
|
|
|
cp -pR $(INSTALL_DIR)/koreader/libs $(ANDROID_LAUNCHER_DIR)/assets
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# binaries are stored as shared libraries to prevent W^X exception on Android 10+
|
|
|
|
|
|
|
|
# https://developer.android.com/about/versions/10/behavior-changes-10#execute-permission
|
|
|
|
|
|
|
|
cp -pR $(INSTALL_DIR)/koreader/sdcv $(ANDROID_LIBS_ABI)/libsdcv.so
|
|
|
|
|
|
|
|
echo "sdcv libsdcv.so" > $(ANDROID_ASSETS)/map.txt
|
|
|
|
|
|
|
|
|
|
|
|
# assets are compressed manually and stored inside the APK.
|
|
|
|
# assets are compressed manually and stored inside the APK.
|
|
|
|
cd $(INSTALL_DIR)/koreader && 7z a -l -m0=lzma2 -mx=9 \
|
|
|
|
cd $(INSTALL_DIR)/koreader && 7z a -l -m0=lzma2 -mx=9 \
|
|
|
|
../../$(ANDROID_ASSETS)/koreader.7z * \
|
|
|
|
../../$(ANDROID_ASSETS)/koreader.7z * \
|
|
|
@ -388,6 +400,7 @@ androidupdate: all
|
|
|
|
-xr!*NOTES.txt$ \
|
|
|
|
-xr!*NOTES.txt$ \
|
|
|
|
-xr!*NOTICE$ \
|
|
|
|
-xr!*NOTICE$ \
|
|
|
|
-xr!*README.md$ \
|
|
|
|
-xr!*README.md$ \
|
|
|
|
|
|
|
|
-xr!*sdcv \
|
|
|
|
-xr'!.*'
|
|
|
|
-xr'!.*'
|
|
|
|
|
|
|
|
|
|
|
|
# make the android APK
|
|
|
|
# make the android APK
|
|
|
|