From 2ce614dc556dd1d56b41d2809e970613d1dfdafe Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 28 Aug 2024 15:31:32 +0200 Subject: [PATCH] try to make core build reproducible --- jni/Android.mk | 3 +-- scripts/ndk-make.sh | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 413e0e180..286ed6c3d 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,5 +1,3 @@ -LOCAL_LDFLAGS += -Wl,--build-id=none - JNI_DIR := $(call my-dir) LOCAL_PATH := $(call my-dir) @@ -33,5 +31,6 @@ LOCAL_CFLAGS += -Drestrict='' -D__EMX__ -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT LOCAL_CFLAGS += -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -ffast-math -D__STDC_CONSTANT_MACROS LOCAL_SRC_FILES := dc_wrapper.c +LOCAL_LDFLAGS += -Wl,--build-id=none include $(BUILD_SHARED_LIBRARY) diff --git a/scripts/ndk-make.sh b/scripts/ndk-make.sh index f517fa0ae..38ad5661e 100755 --- a/scripts/ndk-make.sh +++ b/scripts/ndk-make.sh @@ -65,10 +65,11 @@ if test -z "$NDK_HOST_TAG"; then NDK_HOST_TAG="$KERNEL-$ARCH" fi -unset RUSTFLAGS - +# make core build reproducible ROOT_DIR="$(realpath $(dirname $(dirname "$0")))" export RUSTFLAGS="-C link-args=-Wl,--build-id=none --remap-path-prefix=$HOME/.cargo= --remap-path-prefix=$ROOT_DIR=" +export SOURCE_DATE_EPOCH=1 +export CFLAGS="$CFLAGS -ffile-prefix-map=$ROOT_DIR=" TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG" export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang"