Skip to content

Commit bcecda2

Browse files
committed
Restore Android reproducible build files
The rewards commit 6ffc3a1 also carried staged removals of the reproducible build scripts that belong to unfinished work. This puts env.sh, the F-Droid cargo config template, fdroid/env.sh and fdroid/init.sh back as they were.
1 parent e70c0a9 commit bcecda2

4 files changed

Lines changed: 59 additions & 0 deletions

File tree

‎android/reproducible/env.sh‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
5+
repo_root="$(cd "$script_dir/../.." && pwd)"
6+
7+
export NDK_PATH="${NDK_PATH:?NDK_PATH must point to the Android NDK}"
8+
9+
if [ -f "$HOME/.cargo/env" ]; then
10+
source "$HOME/.cargo/env"
11+
fi
12+
13+
case "$(uname -s)" in
14+
Linux)
15+
ndk_host_tag="linux-x86_64"
16+
;;
17+
Darwin)
18+
ndk_host_tag="darwin-x86_64"
19+
;;
20+
*)
21+
echo "Unsupported host for Android NDK: $(uname -s)" >&2
22+
exit 1
23+
;;
24+
esac
25+
26+
export CARGO_NET_GIT_FETCH_WITH_CLI="${CARGO_NET_GIT_FETCH_WITH_CLI:-true}"
27+
export ANDROID_NDK_HOME="$NDK_PATH"
28+
export ANDROID_NDK_ROOT="$NDK_PATH"
29+
export NDK_HOME="$NDK_PATH"
30+
export NDK_TOOLCHAIN_DIR="$NDK_PATH/toolchains/llvm/prebuilt/$ndk_host_tag/bin"
31+
32+
export AR_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/llvm-ar"
33+
export AR_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/llvm-ar"
34+
35+
export CC_aarch64_linux_android="$NDK_TOOLCHAIN_DIR/aarch64-linux-android28-clang"
36+
export CC_armv7_linux_androideabi="$NDK_TOOLCHAIN_DIR/armv7a-linux-androideabi28-clang"
37+
38+
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$CC_aarch64_linux_android"
39+
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$CC_armv7_linux_androideabi"
40+
export GEMSTONE_ANDROID_ABIS="${GEMSTONE_ANDROID_ABIS:-arm64-v8a,armeabi-v7a}"
41+
42+
home_prefix="${REPRO_BUILD_HOME_PREFIX:-BUILD_HOME}"
43+
export RUSTFLAGS="${RUSTFLAGS:-} --remap-path-prefix=$HOME=$home_prefix --remap-path-prefix=$repo_root=."
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[target.aarch64-linux-android]
2+
ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
3+
linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang"
4+
5+
[target.armv7-linux-androideabi]
6+
ar = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
7+
linker = "{NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi28-clang"

‎android/reproducible/fdroid/env.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
5+
6+
export SKIP_SIGN="${SKIP_SIGN:-true}"
7+
export REPRO_BUILD_HOME_PREFIX="${REPRO_BUILD_HOME_PREFIX:-FDROID_HOME}"
8+
9+
source "$script_dir/../env.sh"

0 commit comments

Comments
 (0)