Skip to content

Commit 3c3b300

Browse files
author
Daniele Briggi
committed
feat(makefile): miniaudio built for android
1 parent a049445 commit 3c3b300

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

.github/workflows/main.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
include:
18-
# - name: linux-vulkan
19-
# os: ubuntu-latest
20-
# arch: x86_64
21-
# make: LLAMA="-DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON"
18+
- name: linux-vulkan
19+
os: ubuntu-latest
20+
arch: x86_64
21+
make: LLAMA="-DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON"
2222
- name: macos
2323
os: macos-latest
2424
- name: windows
2525
os: windows-latest
2626
arch: x86_64
27-
# - name: android
28-
# os: ubuntu-latest
29-
# arch: arm64-v8a
30-
# make: PLATFORM=android ARCH=arm64-v8a
31-
# - name: android
32-
# os: ubuntu-latest
33-
# arch: x86_64
34-
# make: PLATFORM=android ARCH=x86_64
35-
# sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
27+
- name: android
28+
os: ubuntu-latest
29+
arch: arm64-v8a
30+
make: PLATFORM=android ARCH=arm64-v8a
31+
- name: android
32+
os: ubuntu-latest
33+
arch: x86_64
34+
make: PLATFORM=android ARCH=x86_64
35+
sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
3636
# - name: ios
3737
# os: macos-latest
3838
# make: PLATFORM=ios

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ else ifeq ($(PLATFORM),macos)
7474
LLAMA_OPTIONS += -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
7575
WHISPER_OPTIONS += -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DWHISPER_COREML=ON
7676
MINIAUDIO_OPTIONS += -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
77-
STRIP = true
77+
# Strip removes symbols that are needed for the extension to work properly because loaded via `dlopen()`:
78+
# Error: dlopen(./dist/ai.dylib, 0x000A): symbol not found in flat namespace '_whisper_coreml_encode'
7879
# STRIP = strip -x -S $@
80+
STRIP = true
7981
else ifeq ($(PLATFORM),android)
8082
# Set ARCH to find Android NDK's Clang compiler, the user should set the ARCH
8183
ifeq ($(filter %,$(ARCH)),)
@@ -100,6 +102,7 @@ else ifeq ($(PLATFORM),android)
100102
LDFLAGS += -static-libstdc++ -shared
101103
LLAMA_OPTIONS += -DBUILD_SHARED_LIBS=OFF -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_NDK)/build/cmake/android.toolchain.cmake -DANDROID_ABI=$(if $(filter aarch64,$(ARCH)),arm64-v8a,$(ARCH)) -DANDROID_PLATFORM=android-26 -DCMAKE_C_FLAGS="-march=$(if $(filter aarch64,$(ARCH)),armv8.7a,x86-64)" -DCMAKE_CXX_FLAGS="-march=$(if $(filter aarch64,$(ARCH)),armv8.7a,x86-64)" -DGGML_OPENMP=OFF -DGGML_LLAMAFILE=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
102104
WHISPER_OPTIONS += -DBUILD_SHARED_LIBS=OFF -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_NDK)/build/cmake/android.toolchain.cmake -DANDROID_ABI=$(if $(filter aarch64,$(ARCH)),arm64-v8a,$(ARCH)) -DANDROID_PLATFORM=android-26 -DCMAKE_C_FLAGS="-march=$(if $(filter aarch64,$(ARCH)),armv8.7a,x86-64)" -DCMAKE_CXX_FLAGS="-march=$(if $(filter aarch64,$(ARCH)),armv8.7a,x86-64)" -DGGML_OPENMP=OFF -DGGML_LLAMAFILE=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
105+
MINIAUDIO_OPTIONS += -DBUILD_SHARED_LIBS=OFF -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_NDK)/build/cmake/android.toolchain.cmake -DANDROID_ABI=$(if $(filter aarch64,$(ARCH)),arm64-v8a,$(ARCH)) -DANDROID_PLATFORM=android-26 -DCMAKE_C_FLAGS="-march=$(if $(filter aarch64,$(ARCH)),armv8.7a,x86-64)" -DCMAKE_CXX_FLAGS="-march=$(if $(filter aarch64,$(ARCH)),armv8.7a,x86-64)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON
103106
STRIP = $(BIN)/llvm-strip --strip-unneeded $@
104107
else ifeq ($(PLATFORM),ios)
105108
CC = clang

0 commit comments

Comments
 (0)