diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c3b09557f..c01668ea2 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -31,6 +31,13 @@ jobs: matrix: api-level: [29] steps: + - name: Check env vars + run: | + echo ANDROID_NDK_TOOLCHAIN_DIR=$ANDROID_NDK_HOME/toolchains >> $GITHUB_ENV + echo $ANDROID_NDK_TOOLCHAIN_DIR + ls $ANDROID_NDK_HOME + ls $ANDROID_NDK_TOOLCHAIN_DIR + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -50,8 +57,6 @@ jobs: - name: Setup Gradle & Build test cases uses: gradle/gradle-build-action@v3 - env: - ANDROID_NDK_TOOLCHAIN_DIR: ${{ env.ANDROID_NDK_HOME }}/toolchains with: build-root-directory: platforms/android cache-read-only: false diff --git a/platforms/android/library/build.gradle b/platforms/android/library/build.gradle index 4fdec2966..361d30e85 100644 --- a/platforms/android/library/build.gradle +++ b/platforms/android/library/build.gradle @@ -20,6 +20,7 @@ cargo { targets = ["arm", "x86", "x86_64", "arm64"] targetIncludes = ["libuniffi_wysiwyg_composer.so"] targetDirectory = '../../../target' + prebuiltToolchain = true } android { @@ -68,9 +69,7 @@ android { testCoverage { jacocoVersion = "0.8.8" } - - ndkVersion = "27.1.12297006" - + packagingOptions { resources.excludes += 'META-INF/LICENSE.md' resources.excludes += 'META-INF/LICENSE-notice.md'