From d175f00470f66f85616ed75aebe98cc71517eec1 Mon Sep 17 00:00:00 2001
From: oxmc <oxmc@noreply.localhost>
Date: Thu, 4 Sep 2025 02:10:45 -0700
Subject: [PATCH] Update Android.mk

---
 Android.mk | 80 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/Android.mk b/Android.mk
index 6e30d21..a6ab0a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,39 +1,43 @@
-LOCAL_PATH := $(call my-dir)		
-include $(CLEAR_VARS)		
-# Determine the target architecture directory and pattern		
-ifeq ($(TARGET_ARCH),arm64)		
-  ARCH_DIR := arm64		
-  APK_PATTERN := *arm64*.apk		
-else ifeq ($(TARGET_ARCH),arm)		
-  ARCH_DIR := armhf		
-  APK_PATTERN := *armeabi*.apk		
-else ifeq ($(TARGET_ARCH),x86_64)		
-  ARCH_DIR := x86_64		
-  APK_PATTERN := *x86-64*.apk		
-else		
-  $(warning Unsupported architecture $(TARGET_ARCH) for VivladiBrowser)		
-  APK_PATTERN :=		
-endif		
-ifneq ($(APK_PATTERN),)		
-  # Find the APK file		
-  APK_FILE := $(wildcard $(LOCAL_PATH)/prebuilt/$(ARCH_DIR)/$(APK_PATTERN))		
-  		
-  ifeq ($(APK_FILE),)		
-    $(warning No VivladiBrowser APK found for architecture $(TARGET_ARCH))		
-    $(warning Directory: $(LOCAL_PATH)/prebuilt/$(ARCH_DIR)/)		
-    $(warning Pattern: $(APK_PATTERN))		
-  else		
-    # Prebuilt Vivladi Browser APK		
-    LOCAL_MODULE := VivladiBrowser		
-    LOCAL_MODULE_TAGS := optional		
-    LOCAL_MODULE_CLASS := APPS		
-    LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)		
-    LOCAL_SRC_FILES := prebuilt/$(ARCH_DIR)/$(notdir $(APK_FILE))		
-    LOCAL_CERTIFICATE := PRESIGNED		
-    		
-    # Override stock browser packages		
-    LOCAL_OVERRIDES_PACKAGES := Browser2 Browser		
-    		
-    include $(BUILD_PREBUILT)		
-  endif		
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+# Determine the target architecture directory and pattern
+ifeq ($(TARGET_ARCH),arm64)
+  ARCH_DIR := arm64
+  APK_PATTERN := *arm64*.apk
+else ifeq ($(TARGET_ARCH),arm)
+  ARCH_DIR := armhf
+  APK_PATTERN := *armeabi*.apk
+else ifeq ($(TARGET_ARCH),x86_64)
+  ARCH_DIR := x86_64
+  APK_PATTERN := *x86-64*.apk
+else
+  $(warning Unsupported architecture $(TARGET_ARCH) for VivladiBrowser)
+  APK_PATTERN := 
+endif
+ifneq ($(APK_PATTERN),)
+  # Find the APK file
+  APK_FILE := $(wildcard $(LOCAL_PATH)/prebuilt/$(ARCH_DIR)/$(APK_PATTERN))
+
+  # Take the first match only
+  APK_FILE := $(firstword $(APK_FILE_LIST))
+
+  ifeq ($(APK_FILE),)
+    $(warning No VivladiBrowser APK found for architecture $(TARGET_ARCH))
+    $(warning Directory: $(LOCAL_PATH)/prebuilt/$(ARCH_DIR)/)
+    $(warning Pattern: $(APK_PATTERN))
+  else
+    # Prebuilt Vivladi Browser APK
+    LOCAL_MODULE := VivladiBrowser
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE_CLASS := APPS
+    LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+    LOCAL_SRC_FILES := prebuilt/$(ARCH_DIR)/$(notdir $(APK_FILE))
+    LOCAL_CERTIFICATE := PRESIGNED
+
+    # Override stock browser packages
+    LOCAL_OVERRIDES_PACKAGES := Browser2 Browser
+
+    include $(BUILD_PREBUILT)
+  endif
 endif
\ No newline at end of file