From 4b543c15dedbdfd7b0a887d6f8840c383f446b84 Mon Sep 17 00:00:00 2001
From: oxmc <oxmc@noreply.localhost>
Date: Thu, 4 Sep 2025 01:56:35 -0700
Subject: [PATCH] Update Android.mk

---
 Android.bp | 17 -----------------
 Android.mk | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 17 deletions(-)
 delete mode 100644 Android.bp
 create mode 100644 Android.mk

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 91a44b0..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,17 +0,0 @@
-android_app_import {
-    name: "VivladiBrowser",
-    arch: {
-        arm64: {
-            apk: "prebuilt/arm64/*arm64*.apk",
-        },
-        arm: {
-            apk: "prebuilt/armhf/*armeabi*.apk",
-        },
-        x86_64: {
-            apk: "prebuilt/x86_64/*x86-64*.apk",
-        },
-    },
-    presigned: true,
-    privileged: false,
-    overrides: ["Browser", "Browser2"],
-}
\ No newline at end of file
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..6e30d21
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,39 @@
+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		
+endif
\ No newline at end of file