averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support Android AArch64 (#9645)

Browse Source 
c.f., https://github.com/koreader/koreader-base/pull/1540 & https://github.com/koreader/android-luajit-launcher/pull/390
This commit is contained in:
NiLuJe
2022-10-25 01:54:18 +02:00
committed by GitHub
parent f04beb157b
commit 54fae2987e
6 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -16,11 +16,16 @@ endif
IS_RELEASE := $(if $(or $(EMULATE_READER),$(WIN32)),,1)
IS_RELEASE := $(if $(or $(IS_RELEASE),$(APPIMAGE),$(DEBIAN),$(MACOS)),1,)
ANDROID_ARCH?=arm
ifeq ($(ANDROID_ARCH), x86)
ANDROID_ABI:=$(ANDROID_ARCH)
ifeq ($(ANDROID_ARCH), arm64)
ANDROID_ABI?=arm64-v8a
else ifeq ($(ANDROID_ARCH), x86)
ANDROID_ABI?=$(ANDROID_ARCH)
else ifeq ($(ANDROID_ARCH), x86_64)
ANDROID_ABI?=$(ANDROID_ARCH)
else
ANDROID_ARCH?=arm
ANDROID_ABI?=armeabi-v7a
endif
ANDROID_ABI?=armeabi-v7a
# Use the git commit count as the (integer) Android version code
ANDROID_VERSION?=$(shell git rev-list --count HEAD)

2
base

Submodule base updated: 8b1b0dbdef...5957a6b805

4
frontend/device/android/device.lua
View File

@@ -422,8 +422,8 @@ function Device:info()
local is_eink, eink_platform = android.isEink()
local product_type = android.getPlatformName()
local common_text = T(_("%1\n\nOS: Android %2, api %3\nBuild flavor: %4\n"),
android.prop.product, getCodename(), Device.firmware_rev, android.prop.flavor)
local common_text = T(_("%1\n\nOS: Android %2, api %3 on %4\nBuild flavor: %5\n"),
android.prop.product, getCodename(), Device.firmware_rev, jit.arch, android.prop.flavor)
local platform_text = ""
if product_type ~= "android" then

11
kodev
View File

@@ -18,7 +18,12 @@ fi
ANDROID_ARCH="${ANDROID_ARCH:-arm}"
# Default to Android 4.0+; required for NDK 15 but with a custom NDK the strict minimum is 9.
NDKABI="${NDKABI:-14}"
if [[ "${ANDROID_ARCH}" == "arm64" ]] || [[ "${ANDROID_ARCH}" == "x86_64" ]]; then
# 64bit arches require at least ABI 21
NDKABI="${NDKABI:-21}"
else
NDKABI="${NDKABI:-14}"
fi
export NDKABI
# Default android flavor
@@ -156,7 +161,7 @@ SUPPORTED_TARGETS="
cervantes
remarkable
sony-prstux
android
android Supports ANDROID_ARCH arm, arm64, x86 & x86_64
pocketbook
ubuntu-touch
appimage
@@ -799,7 +804,7 @@ TARGET:
android)
command -v adb >/dev/null && {
if [ -z "${no_build}" ]; then
echo "[*] Building KOReader for Android…"
echo "[*] Building KOReader for Android ${ANDROID_ARCH}…"
kodev-release --ignore-translation android
assert_ret_zero $?
fi

2
platform/android/luajit-launcher

Submodule platform/android/luajit-launcher updated: 2228f93099...96d7478c68

15
spec/unit/uimanager_spec.lua
View File

@@ -127,7 +127,9 @@ describe("UIManager spec", function()
assert.are.same("5s", UIManager._task_queue[2].action)
-- insert task at the end after "10s"
UIManager:scheduleIn(10, 'foo') -- is a bit later than "10s", as time.now() is used internally
-- NOTE: Can't use 10, as time.now, which is used internally, may or may not have moved,
-- depending on host's performance and clock granularity (especially if host is fast and/or COARSE is available).
UIManager:scheduleIn(11, 'foo')
assert.are.same('foo', UIManager._task_queue[4].action)
-- insert task at the second last position after "10s"
@@ -145,14 +147,15 @@ describe("UIManager spec", function()
UIManager:scheduleIn(5, 'barba') -- is a bit later than "5s", as time.now() is used internally
assert.are.same('barba', UIManager._task_queue[4].action)
-- "papa" is shortly after "now"
UIManager:nextTick('papa') -- is a bit later than "now"
assert.are.same('papa', UIManager._task_queue[2].action)
-- "mama is shedule now and inserted after "now"
-- "mama" is sheduled now and inserted after "now"
UIManager:schedule(now, 'mama')
assert.are.same('mama', UIManager._task_queue[2].action)
-- "papa" is shortly after "now"
-- NOTE: For the same reason as above, test this last, as time.now may not have moved...
UIManager:nextTick('papa') -- is a bit later than "now"
assert.are.same('papa', UIManager._task_queue[3].action)
-- "letta" is shortly after "papa"
UIManager:tickAfterNext('letta')
assert.are.same("function", type(UIManager._task_queue[4].action))