diff --git a/.forgejo/workflows/build-debug.yml b/.forgejo/workflows/build-debug.yml index 80b0d8e..1dcc692 100644 --- a/.forgejo/workflows/build-debug.yml +++ b/.forgejo/workflows/build-debug.yml @@ -14,6 +14,7 @@ jobs: uses: https://gitea.angry.im/actions/checkout@v3 with: submodules: recursive + fetch-depth: 0 - name: Decode Secret Signing Configuration uses: https://gitea.angry.im/actions/base64-to-file@v1 diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 529a6d8..f35393d 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -2,10 +2,6 @@ on: push: tags: '*' -env: - # Enable reproducibility-related build system workarounds - REPRODUCIBLE_BUILD: true - jobs: release: runs-on: [docker, android-app-certs] @@ -17,6 +13,7 @@ jobs: uses: https://gitea.angry.im/actions/checkout@v3 with: submodules: recursive + fetch-depth: 0 - name: Decode Secret Signing Configuration uses: https://gitea.angry.im/actions/base64-to-file@v1 @@ -37,6 +34,9 @@ jobs: - name: Build Release APK (Unprivileged / EasyEUICC only) run: ./gradlew --no-daemon :app-unpriv:assembleRelease + - name: Copy Debug Symbols to Release Path + run: cp app-unpriv/build/outputs/native-debug-symbols/jmpRelease/native-debug-symbols.zip app-unpriv/build/outputs/apk/jmp/release/ + - name: Create Release uses: https://gitea.angry.im/actions/forgejo-release@v1 with: diff --git a/app-unpriv/build.gradle.kts b/app-unpriv/build.gradle.kts index b664808..f1aa79d 100644 --- a/app-unpriv/build.gradle.kts +++ b/app-unpriv/build.gradle.kts @@ -18,6 +18,7 @@ apply { android { namespace = "im.angry.easyeuicc" compileSdk = 34 + ndkVersion = "26.1.10909125" defaultConfig { applicationId = "im.angry.easyeuicc" diff --git a/libs/lpac-jni/build.gradle.kts b/libs/lpac-jni/build.gradle.kts index 313bf5b..b50a953 100644 --- a/libs/lpac-jni/build.gradle.kts +++ b/libs/lpac-jni/build.gradle.kts @@ -15,12 +15,11 @@ android { externalNativeBuild { ndkBuild { - if (System.getenv("REPRODUCIBLE_BUILD") != "true") { - arguments("-j4") - } else { - arguments("-j1") - cFlags("-fmacro-prefix-map=${project.projectDir.toString()}=/fake/path/") - } + cFlags( + "-fmacro-prefix-map=${project.projectDir.toString()}=/fake/path/", + "-fdebug-prefix-map=${project.projectDir.toString()}=/fake/path/", + "-ffile-prefix-map=${project.projectDir.toString()}=/fake/path/" + ) } } }