Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Code Issues Projects Releases Wiki Activity

make: move android variables where they belong

Browse Source
This commit is contained in:
Benoit Pierre 2024-07-31 01:55:30 +02:00 committed by Frans de Jonge
parent 5c77774ca9
commit 040e033edb
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -17,21 +17,6 @@ endif
IS_RELEASE := $(if $(or $(EMULATE_READER),$(WIN32)),,1)
IS_RELEASE := $(if $(or $(IS_RELEASE),$(APPIMAGE),$(LINUX),$(MACOS)),1,)
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
# Use the git commit count as the (integer) Android version code
ANDROID_VERSION?=$(shell git rev-list --count HEAD)
ANDROID_NAME?=$(VERSION)
LINUX_ARCH?=native
ifeq ($(LINUX_ARCH), native)
LINUX_ARCH_NAME:=$(shell uname -m)

14
make/android.mk
View File

@ -1,9 +1,23 @@
# Use the git commit count as the (integer) Android version code
ANDROID_VERSION ?= $(shell git rev-list --count HEAD)
ANDROID_NAME ?= $(VERSION)
ANDROID_DIR = $(PLATFORM_DIR)/android
ANDROID_LAUNCHER_DIR = $(ANDROID_DIR)/luajit-launcher
ANDROID_ASSETS = $(ANDROID_LAUNCHER_DIR)/assets/module
ANDROID_LIBS_ROOT = $(ANDROID_LAUNCHER_DIR)/libs
ANDROID_LIBS_ABI = $(ANDROID_LIBS_ROOT)/$(ANDROID_ABI)
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
androiddev: update
$(MAKE) -C $(ANDROID_LAUNCHER_DIR) dev