From: Daniel Bevenius <redacted>
Date: Mon, 31 Mar 2025 14:14:33 +0000 (+0200)
Subject: android.java : re-add ggml source updates (#2975)
X-Git-Tag: upstream/1.7.5~20
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=e153b8eaa2d039085c8c7d39d333b007650b3653;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

android.java : re-add ggml source updates (#2975)

This commit updates the ggml source to include the new unary and binary
operations. I merged https://github.com/ggerganov/whisper.cpp/pull/2958
which seems to have overwritten the changes to the ggml source which
were added in https://github.com/ggerganov/whisper.cpp/pull/2972.

Sorry about this.
---

diff --git a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt
index 1ea30917..693b6041 100644
--- a/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt
+++ b/examples/whisper.android.java/app/src/main/jni/whisper/CMakeLists.txt
@@ -12,6 +12,8 @@ set(SOURCE_FILES
     ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu-traits.cpp
     ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu-quants.c
     ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/ggml-cpu.cpp
+    ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/unary-ops.cpp
+    ${WHISPER_LIB_DIR}/ggml/src/ggml-cpu/binary-ops.cpp
     ${WHISPER_LIB_DIR}/ggml/src/ggml-alloc.c
     ${WHISPER_LIB_DIR}/ggml/src/ggml-backend.cpp
     ${WHISPER_LIB_DIR}/ggml/src/ggml-backend-reg.cpp