From 040e033edb9aa125591b7614c5faf6e8165d5c88 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Wed, 31 Jul 2024 01:55:30 +0200
Subject: [PATCH] make: move android variables where they belong

---
 Makefile        | 15 ---------------
 make/android.mk | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 336bea506..c26f89827 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/make/android.mk b/make/android.mk
index 4de10678e..a23c9defe 100644
--- a/make/android.mk
+++ b/make/android.mk
@@ -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