llama-cpp-capacitor 0.0.7 → 0.0.9

package/android/src/main/CMakeLists.txt

@@ -105,41 +105,41 @@ function(build_library target_name arch cpu_flags)
     )
 endfunction()
 
-# Build for different architectures
+# Build for different architectures - use generic name for Java compatibility
 if (ANDROID_ABI STREQUAL "arm64-v8a")
-    build_library(llama-cpp-arm64-v8a "arm" "-march=armv8-a")
+    build_library(llama-cpp "arm" "-march=armv8-a")
 elseif (ANDROID_ABI STREQUAL "armeabi-v7a")
-    build_library(llama-cpp-armeabi-v7a "arm" "-march=armv7-a -mfpu=neon")
+    build_library(llama-cpp "arm" "-march=armv7-a -mfpu=neon")
 elseif (ANDROID_ABI STREQUAL "x86")
-    build_library(llama-cpp-x86 "x86" "-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32")
+    build_library(llama-cpp "x86" "-march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32")
 elseif (ANDROID_ABI STREQUAL "x86_64")
-    build_library(llama-cpp-x86_64 "x86" "-march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel")
+    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-arm64-v8a PRIVATE
+    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-armeabi-v7a PRIVATE
+    target_compile_definitions(llama-cpp PRIVATE
         -DNDEBUG
         -DO3
         -DLM_GGML_USE_CPU
         -DLM_GGML_CPU_GENERIC
     )
 elseif (ANDROID_ABI STREQUAL "x86")
-    target_compile_definitions(llama-cpp-x86 PRIVATE
+    target_compile_definitions(llama-cpp PRIVATE
         -DNDEBUG
         -DO3
         -DLM_GGML_USE_CPU
         -DLM_GGML_CPU_GENERIC
     )
 elseif (ANDROID_ABI STREQUAL "x86_64")
-    target_compile_definitions(llama-cpp-x86_64 PRIVATE
+    target_compile_definitions(llama-cpp PRIVATE
         -DNDEBUG
         -DO3
         -DLM_GGML_USE_CPU

package/android/src/main/jni.cpp

@@ -134,7 +134,7 @@ static jlong next_context_id = 1;
 extern "C" {
 
 JNIEXPORT jlong JNICALL
-Java_ai_annadata_plugin_capacitor_LlamaCpp_initContext(
+Java_ai_annadata_plugin_capacitor_LlamaCpp_initContextNative(
     JNIEnv* env, jobject thiz, jstring model_path, jobject params) {
     
     try {
@@ -176,7 +176,7 @@ Java_ai_annadata_plugin_capacitor_LlamaCpp_initContext(
 }
 
 JNIEXPORT void JNICALL
-Java_ai_annadata_plugin_capacitor_LlamaCpp_releaseContext(
+Java_ai_annadata_plugin_capacitor_LlamaCpp_releaseContextNative(
     JNIEnv* env, jobject thiz, jlong context_id) {
     
     try {
@@ -192,8 +192,8 @@ Java_ai_annadata_plugin_capacitor_LlamaCpp_releaseContext(
 }
 
 JNIEXPORT jstring JNICALL
-Java_ai_annadata_plugin_capacitor_LlamaCpp_completion(
-    JNIEnv* env, jobject thiz, jlong context_id, jstring prompt, jobject params) {
+Java_ai_annadata_plugin_capacitor_LlamaCpp_completionNative(
+    JNIEnv* env, jobject thiz, jlong context_id, jstring prompt) {
     
     try {
         auto it = contexts.find(context_id);
@@ -222,7 +222,7 @@ Java_ai_annadata_plugin_capacitor_LlamaCpp_completion(
 }
 
 JNIEXPORT void JNICALL
-Java_ai_annadata_plugin_capacitor_LlamaCpp_stopCompletion(
+Java_ai_annadata_plugin_capacitor_LlamaCpp_stopCompletionNative(
     JNIEnv* env, jobject thiz, jlong context_id) {
     
     try {
@@ -238,7 +238,7 @@ Java_ai_annadata_plugin_capacitor_LlamaCpp_stopCompletion(
 }
 
 JNIEXPORT jstring JNICALL
-Java_ai_annadata_plugin_capacitor_LlamaCpp_getFormattedChat(
+Java_ai_annadata_plugin_capacitor_LlamaCpp_getFormattedChatNative(
     JNIEnv* env, jobject thiz, jlong context_id, jstring messages, jstring chat_template) {
     
     try {
@@ -267,7 +267,7 @@ Java_ai_annadata_plugin_capacitor_LlamaCpp_getFormattedChat(
 }
 
 JNIEXPORT jboolean JNICALL
-Java_ai_annadata_plugin_capacitor_LlamaCpp_toggleNativeLog(
+Java_ai_annadata_plugin_capacitor_LlamaCpp_toggleNativeLogNative(
     JNIEnv* env, jobject thiz, jboolean enabled) {
     
     try {
@@ -281,6 +281,8 @@ Java_ai_annadata_plugin_capacitor_LlamaCpp_toggleNativeLog(
     }
 }
 
+
+
 } // extern "C"
 
 } // namespace jni_utils

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llama-cpp-capacitor",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "A native Capacitor plugin that embeds llama.cpp directly into mobile apps, enabling offline AI inference with comprehensive support for text generation, multimodal processing, TTS, LoRA adapters, and more.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",