llama-cpp-capacitor 0.0.13 → 0.0.21

package/android/build.gradle

@@ -1,69 +1,88 @@
-ext {
-    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
-}
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
-    }
-}
-
-apply plugin: 'com.android.library'
-
-android {
-    namespace "ai.annadata.plugin.capacitor"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
-    defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        
-        ndk {
-            abiFilters 'arm64-v8a'
-        }
-    }
-    
-    externalNativeBuild {
-        cmake {
-            path "src/main/CMakeLists.txt"
-            version "3.22.1"
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lintOptions {
-        abortOnError false
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
-    }
-}
-
-repositories {
-    google()
-    mavenCentral()
-}
-
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':capacitor-android')
-    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
-    testImplementation "junit:junit:$junitVersion"
-    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
-    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-}
+ext {
+    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
+}
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.7.2'
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    namespace "ai.annadata.plugin.capacitor"
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
+    defaultConfig {
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        
+        ndk {
+            abiFilters 'arm64-v8a'
+        }
+    }
+    
+    externalNativeBuild {
+        cmake {
+            path "src/main/CMakeLists.txt"
+            version "3.22.1"
+            // Explicitly set NDK version to avoid Windows dependencies
+            ndkVersion "29.0.13113456"
+        }
+    }
+    
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    
+    lintOptions {
+        abortOnError false
+    }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+    
+    sourceSets {
+        main {
+            java {
+                srcDirs = ['src/main/java']
+            }
+        }
+    }
+    
+    // Disable clean tasks that might cause issues
+    tasks.whenTaskAdded { task ->
+        if (task.name.contains('Clean') && task.name.contains('Debug')) {
+            task.enabled = false
+        }
+    }
+}
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':capacitor-android')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+}

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/android/src/main/CMakeLists-arm64.txt

@@ -0,0 +1,131 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(llama-cpp)
+
+set(CMAKE_CXX_STANDARD 17)
+set(LLAMACPP_LIB_DIR ${CMAKE_SOURCE_DIR}/../../../cpp)
+
+include_directories(
+    ${LLAMACPP_LIB_DIR}
+    ${LLAMACPP_LIB_DIR}/ggml-cpu
+    ${LLAMACPP_LIB_DIR}/tools/mtmd
+)
+
+set(
+    SOURCE_FILES
+    ${LLAMACPP_LIB_DIR}/ggml.c
+    ${LLAMACPP_LIB_DIR}/ggml-alloc.c
+    ${LLAMACPP_LIB_DIR}/ggml-backend.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-backend-reg.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/amx/amx.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/amx/mmq.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/ggml-cpu.c
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/ggml-cpu.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/quants.c
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/traits.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/repack.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/unary-ops.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/binary-ops.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/vec.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/ops.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-opt.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-threading.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-quants.c
+    ${LLAMACPP_LIB_DIR}/gguf.cpp
+    ${LLAMACPP_LIB_DIR}/log.cpp
+    ${LLAMACPP_LIB_DIR}/llama-impl.cpp
+    ${LLAMACPP_LIB_DIR}/chat-parser.cpp
+    ${LLAMACPP_LIB_DIR}/json-partial.cpp
+    ${LLAMACPP_LIB_DIR}/regex-partial.cpp
+    # Multimodal support
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/mtmd.cpp
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/mtmd-audio.cpp
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/clip.cpp
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/mtmd-helper.cpp
+    ${LLAMACPP_LIB_DIR}/llama-grammar.cpp
+    ${LLAMACPP_LIB_DIR}/llama-sampling.cpp
+    ${LLAMACPP_LIB_DIR}/llama-vocab.cpp
+    ${LLAMACPP_LIB_DIR}/llama-adapter.cpp
+    ${LLAMACPP_LIB_DIR}/llama-chat.cpp
+    ${LLAMACPP_LIB_DIR}/llama-context.cpp
+    ${LLAMACPP_LIB_DIR}/llama-arch.cpp
+    ${LLAMACPP_LIB_DIR}/llama-batch.cpp
+    ${LLAMACPP_LIB_DIR}/llama-cparams.cpp
+    ${LLAMACPP_LIB_DIR}/llama-hparams.cpp
+    ${LLAMACPP_LIB_DIR}/llama.cpp
+    ${LLAMACPP_LIB_DIR}/llama-model.cpp
+    ${LLAMACPP_LIB_DIR}/llama-model-loader.cpp
+    ${LLAMACPP_LIB_DIR}/llama-model-saver.cpp
+    ${LLAMACPP_LIB_DIR}/llama-kv-cache.cpp
+    ${LLAMACPP_LIB_DIR}/llama-kv-cache-iswa.cpp
+    ${LLAMACPP_LIB_DIR}/llama-memory-hybrid.cpp
+    ${LLAMACPP_LIB_DIR}/llama-memory-recurrent.cpp
+    ${LLAMACPP_LIB_DIR}/llama-mmap.cpp
+    ${LLAMACPP_LIB_DIR}/llama-vocab.cpp
+    ${LLAMACPP_LIB_DIR}/llama-memory.cpp
+    ${LLAMACPP_LIB_DIR}/llama-io.cpp
+    ${LLAMACPP_LIB_DIR}/llama-graph.cpp
+    ${LLAMACPP_LIB_DIR}/sampling.cpp
+    ${LLAMACPP_LIB_DIR}/unicode-data.cpp
+    ${LLAMACPP_LIB_DIR}/unicode.cpp
+    ${LLAMACPP_LIB_DIR}/common.cpp
+    ${LLAMACPP_LIB_DIR}/chat.cpp
+    ${LLAMACPP_LIB_DIR}/json-schema-to-grammar.cpp
+    ${LLAMACPP_LIB_DIR}/nlohmann/json.hpp
+    ${LLAMACPP_LIB_DIR}/nlohmann/json_fwd.hpp
+    ${LLAMACPP_LIB_DIR}/minja/minja.hpp
+    ${LLAMACPP_LIB_DIR}/minja/chat-template.hpp
+    ${LLAMACPP_LIB_DIR}/anyascii.c
+    ${LLAMACPP_LIB_DIR}/cap-llama.cpp
+    ${LLAMACPP_LIB_DIR}/cap-completion.cpp
+    ${LLAMACPP_LIB_DIR}/cap-tts.cpp
+    ${CMAKE_SOURCE_DIR}/jni-utils.h
+    ${CMAKE_SOURCE_DIR}/jni.cpp
+)
+
+# Find Android libraries
+find_library(LOG_LIB log)
+find_library(ANDROID_LIB android)
+
+# ARM64 specific build function for real devices
+function(build_library_arm64 target_name)
+    add_library(
+        ${target_name}
+        SHARED
+        ${SOURCE_FILES}
+    )
+
+    # ARM64 specific compile options for real devices
+    target_compile_options(${target_name} PRIVATE
+        -march=armv8-a
+        -mtune=cortex-a76
+        -O3
+        -DNDEBUG
+        -DLM_GGML_USE_CPU
+        -DLM_GGML_CPU_GENERIC
+        -fno-finite-math-only
+        -funroll-loops
+    )
+
+    # Link with Android libraries
+    target_link_libraries(${target_name} 
+        ${LOG_LIB}
+        ${ANDROID_LIB}
+    )
+    
+    # Set output name and directory
+    set_target_properties(${target_name} PROPERTIES
+        OUTPUT_NAME "llama-cpp-arm64"
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/arm64-v8a"
+    )
+endfunction()
+
+# Build ARM64 library for real devices
+build_library_arm64(llama-cpp-arm64)
+
+# Print build information
+message(STATUS "Building llama-cpp for Android ARM64 (real devices)")
+message(STATUS "Source directory: ${LLAMACPP_LIB_DIR}")
+message(STATUS "Architecture: ARM64 (arm64-v8a)")
+message(STATUS "Optimizations: ARMv8-A, Cortex-A76 tuning")
+message(STATUS "Output directory: ${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/arm64-v8a")

package/android/src/main/CMakeLists-x86_64.txt

@@ -0,0 +1,135 @@
+cmake_minimum_required(VERSION 3.10)
+
+project(llama-cpp)
+
+set(CMAKE_CXX_STANDARD 17)
+set(LLAMACPP_LIB_DIR ${CMAKE_SOURCE_DIR}/../../../cpp)
+
+include_directories(
+    ${LLAMACPP_LIB_DIR}
+    ${LLAMACPP_LIB_DIR}/ggml-cpu
+    ${LLAMACPP_LIB_DIR}/tools/mtmd
+)
+
+set(
+    SOURCE_FILES
+    ${LLAMACPP_LIB_DIR}/ggml.c
+    ${LLAMACPP_LIB_DIR}/ggml-alloc.c
+    ${LLAMACPP_LIB_DIR}/ggml-backend.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-backend-reg.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/amx/amx.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/amx/mmq.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/ggml-cpu.c
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/ggml-cpu.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/quants.c
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/traits.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/repack.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/unary-ops.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/binary-ops.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/vec.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-cpu/ops.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-opt.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-threading.cpp
+    ${LLAMACPP_LIB_DIR}/ggml-quants.c
+    ${LLAMACPP_LIB_DIR}/gguf.cpp
+    ${LLAMACPP_LIB_DIR}/log.cpp
+    ${LLAMACPP_LIB_DIR}/llama-impl.cpp
+    ${LLAMACPP_LIB_DIR}/chat-parser.cpp
+    ${LLAMACPP_LIB_DIR}/json-partial.cpp
+    ${LLAMACPP_LIB_DIR}/regex-partial.cpp
+    # Multimodal support
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/mtmd.cpp
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/mtmd-audio.cpp
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/clip.cpp
+    ${LLAMACPP_LIB_DIR}/tools/mtmd/mtmd-helper.cpp
+    ${LLAMACPP_LIB_DIR}/llama-grammar.cpp
+    ${LLAMACPP_LIB_DIR}/llama-sampling.cpp
+    ${LLAMACPP_LIB_DIR}/llama-vocab.cpp
+    ${LLAMACPP_LIB_DIR}/llama-adapter.cpp
+    ${LLAMACPP_LIB_DIR}/llama-chat.cpp
+    ${LLAMACPP_LIB_DIR}/llama-context.cpp
+    ${LLAMACPP_LIB_DIR}/llama-arch.cpp
+    ${LLAMACPP_LIB_DIR}/llama-batch.cpp
+    ${LLAMACPP_LIB_DIR}/llama-cparams.cpp
+    ${LLAMACPP_LIB_DIR}/llama-hparams.cpp
+    ${LLAMACPP_LIB_DIR}/llama.cpp
+    ${LLAMACPP_LIB_DIR}/llama-model.cpp
+    ${LLAMACPP_LIB_DIR}/llama-model-loader.cpp
+    ${LLAMACPP_LIB_DIR}/llama-model-saver.cpp
+    ${LLAMACPP_LIB_DIR}/llama-kv-cache.cpp
+    ${LLAMACPP_LIB_DIR}/llama-kv-cache-iswa.cpp
+    ${LLAMACPP_LIB_DIR}/llama-memory-hybrid.cpp
+    ${LLAMACPP_LIB_DIR}/llama-memory-recurrent.cpp
+    ${LLAMACPP_LIB_DIR}/llama-mmap.cpp
+    ${LLAMACPP_LIB_DIR}/llama-vocab.cpp
+    ${LLAMACPP_LIB_DIR}/llama-memory.cpp
+    ${LLAMACPP_LIB_DIR}/llama-io.cpp
+    ${LLAMACPP_LIB_DIR}/llama-graph.cpp
+    ${LLAMACPP_LIB_DIR}/sampling.cpp
+    ${LLAMACPP_LIB_DIR}/unicode-data.cpp
+    ${LLAMACPP_LIB_DIR}/unicode.cpp
+    ${LLAMACPP_LIB_DIR}/common.cpp
+    ${LLAMACPP_LIB_DIR}/chat.cpp
+    ${LLAMACPP_LIB_DIR}/json-schema-to-grammar.cpp
+    ${LLAMACPP_LIB_DIR}/nlohmann/json.hpp
+    ${LLAMACPP_LIB_DIR}/nlohmann/json_fwd.hpp
+    ${LLAMACPP_LIB_DIR}/minja/minja.hpp
+    ${LLAMACPP_LIB_DIR}/minja/chat-template.hpp
+    ${LLAMACPP_LIB_DIR}/anyascii.c
+    ${LLAMACPP_LIB_DIR}/cap-llama.cpp
+    ${LLAMACPP_LIB_DIR}/cap-completion.cpp
+    ${LLAMACPP_LIB_DIR}/cap-tts.cpp
+    ${CMAKE_SOURCE_DIR}/jni-utils.h
+    ${CMAKE_SOURCE_DIR}/jni.cpp
+)
+
+find_library(LOG_LIB log)
+
+# X86_64 specific build function for emulator
+function(build_library_x86_64 target_name)
+    add_library(
+        ${target_name}
+        SHARED
+        ${SOURCE_FILES}
+    )
+
+    # X86_64 specific compile options for emulator
+    target_compile_options(${target_name} PRIVATE
+        -march=x86-64
+        -mtune=generic
+        -mavx2
+        -mavx
+        -msse3
+        -msse
+        -mfma
+        -mf16c
+        -O3
+        -DNDEBUG
+        -DLM_GGML_USE_CPU
+        -DLM_GGML_CPU_GENERIC
+        -DLM_GGML_USE_AVX2
+        -DLM_GGML_USE_AVX
+        -DLM_GGML_USE_SSE3
+        -DLM_GGML_USE_SSE
+        -DLM_GGML_USE_FMA
+        -DLM_GGML_USE_F16C
+    )
+
+    target_link_libraries(${target_name} ${LOG_LIB})
+    
+    # Set output name
+    set_target_properties(${target_name} PROPERTIES
+        OUTPUT_NAME "llama-cpp-x86_64"
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/x86_64"
+    )
+endfunction()
+
+# Build x86_64 library for emulator
+build_library_x86_64(llama-cpp-x86_64)
+
+# Print build information
+message(STATUS "Building llama-cpp for Android x86_64 (emulator)")
+message(STATUS "Source directory: ${LLAMACPP_LIB_DIR}")
+message(STATUS "Architecture: x86_64")
+message(STATUS "Optimizations: AVX2, AVX, SSE3, SSE, FMA, F16C")
+message(STATUS "Output directory: ${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/x86_64")

package/android/src/main/CMakeLists.txt

@@ -76,73 +76,56 @@ set(
     ${LLAMACPP_LIB_DIR}/minja/minja.hpp
     ${LLAMACPP_LIB_DIR}/minja/chat-template.hpp
     ${LLAMACPP_LIB_DIR}/anyascii.c
-    ${LLAMACPP_LIB_DIR}/rn-llama.cpp
-    ${LLAMACPP_LIB_DIR}/rn-completion.cpp
-    ${LLAMACPP_LIB_DIR}/rn-tts.cpp
+    ${LLAMACPP_LIB_DIR}/cap-llama.cpp
+    ${LLAMACPP_LIB_DIR}/cap-completion.cpp
+    ${LLAMACPP_LIB_DIR}/cap-tts.cpp
     ${CMAKE_SOURCE_DIR}/jni-utils.h
     ${CMAKE_SOURCE_DIR}/jni.cpp
 )
 
+# Find Android libraries
 find_library(LOG_LIB log)
+find_library(ANDROID_LIB android)
 
-function(build_library target_name arch cpu_flags)
-    set(SOURCE_FILES_ARCH "")
-    # For now, use generic implementation for all architectures
-    # This ensures we have all required functions
-
+# ARM64 specific build function for real devices
+function(build_library_arm64 target_name)
     add_library(
         ${target_name}
         SHARED
         ${SOURCE_FILES}
-        ${SOURCE_FILES_ARCH}
-    )
-
-    target_compile_options(${target_name} PRIVATE ${cpu_flags})
-    target_link_libraries(${target_name} ${LOG_LIB})
-
-    set_target_properties(${target_name} PROPERTIES
-        LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}
     )
-endfunction()
 
-# Build for different architectures - use generic name for Java compatibility
-if (ANDROID_ABI STREQUAL "arm64-v8a")
-    build_library(llama-cpp "arm" "-march=armv8-a")
-elseif (ANDROID_ABI STREQUAL "armeabi-v7a")
-    build_library(llama-cpp "arm" "-march=armv7-a -mfpu=neon")
-elseif (ANDROID_ABI STREQUAL "x86")
-    build_library(llama-cpp "x86" "-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32")
-elseif (ANDROID_ABI STREQUAL "x86_64")
-    build_library(llama-cpp "x86" "-march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel")
-endif()
-
-# Set compile definitions for the target that was actually built
-if (ANDROID_ABI STREQUAL "arm64-v8a")
-    target_compile_definitions(llama-cpp PRIVATE
-        -DNDEBUG
-        -DO3
-        -DLM_GGML_USE_CPU
-        -DLM_GGML_CPU_GENERIC
-    )
-elseif (ANDROID_ABI STREQUAL "armeabi-v7a")
-    target_compile_definitions(llama-cpp PRIVATE
+    # ARM64 specific compile options for real devices
+    target_compile_options(${target_name} PRIVATE
+        -march=armv8-a
+        -mtune=cortex-a76
+        -O3
         -DNDEBUG
-        -DO3
         -DLM_GGML_USE_CPU
         -DLM_GGML_CPU_GENERIC
+        -fno-finite-math-only
+        -funroll-loops
     )
-elseif (ANDROID_ABI STREQUAL "x86")
-    target_compile_definitions(llama-cpp PRIVATE
-        -DNDEBUG
-        -DO3
-        -DLM_GGML_USE_CPU
-        -DLM_GGML_CPU_GENERIC
+
+    # Link with Android libraries
+    target_link_libraries(${target_name} 
+        ${LOG_LIB}
+        ${ANDROID_LIB}
     )
-elseif (ANDROID_ABI STREQUAL "x86_64")
-    target_compile_definitions(llama-cpp PRIVATE
-        -DNDEBUG
-        -DO3
-        -DLM_GGML_USE_CPU
-        -DLM_GGML_CPU_GENERIC
+    
+    # Set output name and directory
+    set_target_properties(${target_name} PROPERTIES
+        OUTPUT_NAME "llama-cpp-arm64"
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/arm64-v8a"
     )
-endif()
+endfunction()
+
+# Build ARM64 library for real devices
+build_library_arm64(llama-cpp-arm64)
+
+# Print build information
+message(STATUS "Building llama-cpp for Android ARM64 (real devices)")
+message(STATUS "Source directory: ${LLAMACPP_LIB_DIR}")
+message(STATUS "Architecture: ARM64 (arm64-v8a)")
+message(STATUS "Optimizations: ARMv8-A, Cortex-A76 tuning")
+message(STATUS "Output directory: ${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/arm64-v8a")