diff --git a/Android.mk b/Android.mk index a6ab0a5..ec048f3 100644 --- a/Android.mk +++ b/Android.mk @@ -16,18 +16,13 @@ else 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)) + APK_FILE := $(firstword $(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 @@ -35,8 +30,8 @@ ifneq ($(APK_PATTERN),) LOCAL_SRC_FILES := prebuilt/$(ARCH_DIR)/$(notdir $(APK_FILE)) LOCAL_CERTIFICATE := PRESIGNED - # Override stock browser packages - LOCAL_OVERRIDES_PACKAGES := Browser2 Browser + # Override stock browser(s) + LOCAL_OVERRIDES_PACKAGES := Browser Browser2 include $(BUILD_PREBUILT) endif