From 03e63805704d728c29484d401ce0bbf423b243af Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 13 Apr 2024 11:33:00 -0400 Subject: [PATCH] Ditch REPRODUCIBLE_BUILD flag and set all prefix maps unconditionally --- .forgejo/workflows/release.yml | 4 ---- libs/lpac-jni/build.gradle.kts | 11 +++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index e89323a..650e95b 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] 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/" + ) } } }