diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index c49505d1..eabb370d 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -33,6 +33,8 @@ jobs: path: dl3/android/DeepLabV3Demo - name: MV3Demo path: mv3/android/MV3Demo + - name: YoloDemo + path: Yolo/android name: Build ${{ matrix.name }} @@ -50,7 +52,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Download local AAR - if: ${{ inputs.local_aar && matrix.name == 'LlamaDemo' }} + if: ${{ inputs.local_aar && (matrix.name == 'LlamaDemo' || matrix.name == 'YoloDemo') }} run: | mkdir -p ${{ matrix.path }}/app/libs curl -fL -o ${{ matrix.path }}/app/libs/executorch.aar "${{ inputs.local_aar }}" @@ -58,7 +60,7 @@ jobs: - name: Build with Gradle working-directory: ${{ matrix.path }} run: | - if [ -n "${{ inputs.local_aar }}" ] && [ "${{ matrix.name }}" == "LlamaDemo" ]; then + if [ -n "${{ inputs.local_aar }}" ] && ([ "${{ matrix.name }}" == "LlamaDemo" ] || [ "${{ matrix.name }}" == "YoloDemo" ]); then ./gradlew build --no-daemon -PuseLocalAar=true else ./gradlew build --no-daemon @@ -112,6 +114,7 @@ jobs: - LlamaDemo APKs (`app-debug-LlamaDemo.apk`, `app-release-unsigned-LlamaDemo.apk`) - DeepLabV3Demo APKs (`app-debug-DeepLabV3Demo.apk`, `app-release-unsigned-DeepLabV3Demo.apk`) - MV3Demo APKs (`app-debug-MV3Demo.apk`, `app-release-unsigned-MV3Demo.apk`) + - YoloDemo APKs (`app-debug-YoloDemo.apk`, `app-release-unsigned-YoloDemo.apk`) **Build Date:** ${{ steps.tag.outputs.build_date }} **Commit:** ${{ github.sha }} diff --git a/Yolo/android/app/build.gradle.kts b/Yolo/android/app/build.gradle.kts index f9dc9b56..99614ac8 100644 --- a/Yolo/android/app/build.gradle.kts +++ b/Yolo/android/app/build.gradle.kts @@ -60,7 +60,11 @@ dependencies { implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha12") implementation("com.facebook.fbjni:fbjni:0.5.1") implementation("com.google.code.gson:gson:2.8.6") - implementation(files("libs/executorch.aar")) + if (useLocalAar == true) { + implementation(files("libs/executorch.aar")) + } else { + implementation("org.pytorch:executorch-android:1.1.0") + } implementation("com.google.android.material:material:1.12.0") implementation("androidx.activity:activity:1.9.0") diff --git a/Yolo/android/app/src/main/AndroidManifest.xml b/Yolo/android/app/src/main/AndroidManifest.xml index 0569bcb8..e05f5de4 100644 --- a/Yolo/android/app/src/main/AndroidManifest.xml +++ b/Yolo/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,8 @@ + +