diff --git a/extension/android/jni/jni_layer_llama.cpp b/extension/android/jni/jni_layer_llama.cpp index d162d199703..888e09e7989 100644 --- a/extension/android/jni/jni_layer_llama.cpp +++ b/extension/android/jni/jni_layer_llama.cpp @@ -171,12 +171,12 @@ class ExecuTorchLlmJni : public facebook::jni::HybridClass { #endif model_type_category_ = model_type_category; + std::vector data_files_vector; if (model_type_category == MODEL_TYPE_CATEGORY_MULTIMODAL) { multi_modal_runner_ = llm::create_multimodal_runner( model_path->toStdString().c_str(), llm::load_tokenizer(tokenizer_path->toStdString())); } else if (model_type_category == MODEL_TYPE_CATEGORY_LLM) { - std::vector data_files_vector; if (data_files != nullptr) { // Convert Java List to C++ std::vector auto list_class = facebook::jni::findClassStatic("java/util/List"); @@ -209,6 +209,7 @@ class ExecuTorchLlmJni : public facebook::jni::HybridClass { decoder_model.c_str(), model_path->toStdString().c_str(), tokenizer_path->toStdString().c_str(), + "", ""); model_type_category_ = MODEL_TYPE_CATEGORY_LLM; #endif diff --git a/scripts/build_android_library.sh b/scripts/build_android_library.sh index a50d15709bd..a9934bbc508 100755 --- a/scripts/build_android_library.sh +++ b/scripts/build_android_library.sh @@ -66,7 +66,7 @@ build_android_native_library() { # Copy QNN related so library if [ -n "$QNN_SDK_ROOT" ] && [ "$ANDROID_ABI" == "arm64-v8a" ]; then - cp "${CMAKE_OUT}"/lib/libqnn_executorch_backend.so ${SO_STAGE_DIR} + cp "${CMAKE_OUT}"/lib/executorch/backends/qualcomm/libqnn_executorch_backend.so ${SO_STAGE_DIR} fi # Copy MTK related so library