diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 059a897cc..72e379dd5 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -142,6 +142,16 @@ jobs: asset_name: MapLibreAndroid-release.aar asset_content_type: application/zip + - name: Upload debug symbols + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: platform/android/build/debug-symbols.tar.gz + asset_name: debug-symbols.tar.gz + asset_content_type: application/gzip + - name: Clean release run: | rm -f ${{ steps.prepare_release.outputs.release_notes }} diff --git a/platform/android/Makefile b/platform/android/Makefile index ba1499be9..a96aa290e 100644 --- a/platform/android/Makefile +++ b/platform/android/Makefile @@ -215,11 +215,12 @@ run-android-unit-test: run-android-unit-test-%: $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:testLegacyDebugUnitTest --info --tests "$*" -# Builds a release package of the Android SDK +# Builds a release package and .tar.gz with debug symbols of the Android SDK .PHONY: apackage apackage: make android-lib-arm-v7 && make android-lib-arm-v8 && make android-lib-x86 && make android-lib-x86-64 - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=all assemble$(BUILDTYPE) + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=all assembleDrawable$(BUILDTYPE) + tar -czvf build/debug-symbols.tar.gz -C MapLibreAndroid/build/intermediates/library_jni/drawableRelease/jni . # Build test app instrumentation tests apk and test app apk for all abi's .PHONY: android-ui-test diff --git a/platform/android/MapLibreAndroid/gradle.properties b/platform/android/MapLibreAndroid/gradle.properties index 006a2f618..f3d241b07 100644 --- a/platform/android/MapLibreAndroid/gradle.properties +++ b/platform/android/MapLibreAndroid/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=11.0.0-pre4 +VERSION_NAME=11.0.0-pre6 # Only build native dependencies for the current ABI # See https://code.google.com/p/android/issues/detail?id=221098#c20