From f5dc272deaefe32ac0490e685b6f9e2959d7e1db Mon Sep 17 00:00:00 2001
From: oxmc <oxmc@noreply.localhost>
Date: Wed, 3 Sep 2025 10:26:52 -0700
Subject: [PATCH] Update Android.mk

---
 Android.mk | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 2cd8e88..5ac223c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,47 @@
+# vendor/vivladi/VivladiBrowser/Android.mk
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
\ No newline at end of file
+include $(CLEAR_VARS)
+
+# Determine the target architecture directory
+ifeq ($(TARGET_ARCH),arm64)
+  ARCH_DIR := arm64
+  APK_PATTERN := *arm64*.apk
+else ifeq ($(TARGET_ARCH),arm)
+  ARCH_DIR := armhf
+  APK_PATTERN := *arm*.apk
+else ifeq ($(TARGET_ARCH),x86_64)
+  ARCH_DIR := x86_64
+  APK_PATTERN := *x86_64*.apk
+else
+  # Default to arm64 if architecture not specified
+  ARCH_DIR := arm64
+  APK_PATTERN := *arm64*.apk
+endif
+
+# Find the APK file using wildcard pattern
+APK_FILE := $(wildcard $(LOCAL_PATH)/prebuilt/$(ARCH_DIR)/$(APK_PATTERN))
+
+# Prebuilt Vivladi Browser APK - Regular user app (not system app)
+LOCAL_MODULE := VivladiBrowser
+LOCAL_MODULE_STEM := VivladiBrowser.apk
+LOCAL_SRC_FILES := prebuilt/$(ARCH_DIR)/$(notdir $(APK_FILE))
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_CERTIFICATE := PRESIGNED
+
+# Install as regular user app (not privileged)
+LOCAL_MODULE_PATH := $(TARGET_OUT)/app/VivladiBrowser
+
+# Override stock browser packages
+LOCAL_OVERRIDES_PACKAGES := Browser2 Browser
+
+# Check if the architecture-specific APK exists
+ifneq ($(APK_FILE),)
+    include $(BUILD_PREBUILT)
+else
+    $(warning No VivladiBrowser APK found for architecture $(TARGET_ARCH) at $(LOCAL_PATH)/prebuilt/$(ARCH_DIR)/)
+    $(warning Pattern used: $(APK_PATTERN))
+    $(warning Skipping VivladiBrowser build)
+endif
\ No newline at end of file