android : fix build and ci (#2624)

* Adding missing CMakeLists.txt include for ggm-cpu needed by whisper.android

* attempt to re-enable CI for JNI android

---------

Co-authored-by: Your Name <you@example.com>
This commit is contained in:
Thamster 2024-12-14 10:25:53 -05:00 committed by GitHub
parent 6aa1d7b892
commit 6a52eaea74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 29 deletions

View File

@ -564,35 +564,34 @@ jobs:
- name: Build swiftui example - name: Build swiftui example
run: xcodebuild -project examples/whisper.swiftui/whisper.swiftui.xcodeproj -scheme WhisperCppDemo -configuration ${{ matrix.build }} -sdk iphoneos CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= -destination 'generic/platform=iOS' build run: xcodebuild -project examples/whisper.swiftui/whisper.swiftui.xcodeproj -scheme WhisperCppDemo -configuration ${{ matrix.build }} -sdk iphoneos CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= -destination 'generic/platform=iOS' build
# TODO: update android build and re-enable when it works android:
# android: runs-on: ubuntu-latest
# runs-on: ubuntu-latest
# steps:
# steps: - name: Clone
# - name: Clone uses: actions/checkout@v4
# uses: actions/checkout@v4 with:
# with: path: whisper
# path: whisper
# - name: Install Java
# - name: Install Java uses: actions/setup-java@v4
# uses: actions/setup-java@v4 with:
# with: distribution: zulu
# distribution: zulu java-version: 21
# java-version: 21
# - name: Setup Android SDK
# - name: Setup Android SDK uses: android-actions/setup-android@v3
# uses: android-actions/setup-android@v3
# - name: Build
# - name: Build run: |
# run: | cd whisper/examples/whisper.android
# cd whisper/examples/whisper.android ./gradlew assembleRelease --no-daemon
# ./gradlew assembleRelease --no-daemon
# - name: Build with external ggml
# - name: Build with external ggml run: |
# run: | export PATH_TO_GGML=$PWD/ggml
# export PATH_TO_GGML=$PWD/ggml cd whisper/examples/whisper.android
# cd whisper/examples/whisper.android ./gradlew assembleRelease --no-daemon
# ./gradlew assembleRelease --no-daemon
# TODO: disable because of following fail: https://github.com/ggerganov/whisper.cpp/actions/runs/11019444420/job/30627193602 # TODO: disable because of following fail: https://github.com/ggerganov/whisper.cpp/actions/runs/11019444420/job/30627193602
# android_java: # android_java:

View File

@ -88,3 +88,5 @@ include_directories(${WHISPER_LIB_DIR}/src)
include_directories(${WHISPER_LIB_DIR}/include) include_directories(${WHISPER_LIB_DIR}/include)
include_directories(${WHISPER_LIB_DIR}/ggml/include) include_directories(${WHISPER_LIB_DIR}/ggml/include)
include_directories(${WHISPER_LIB_DIR}/ggml/src) include_directories(${WHISPER_LIB_DIR}/ggml/src)
include_directories(${WHISPER_LIB_DIR}/ggml/src/ggml-cpu)