From 7955eed052ffe8559fda126e522161bb488fb1ac Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 4 Jan 2022 16:39:53 -0500 Subject: [PATCH] Fennec 96.1.0 Signed-off-by: Tad --- build.sh | 2 +- prebuild.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index e3d0b742..a1705765 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ JAVA_HOME="$java8" "$ANDROID_HOME/tools/bin/sdkmanager" 'cmake;3.18.1' # require "$rustup"/rustup-init.sh -y # shellcheck disable=SC1091 source "$HOME/.cargo/env" -rustup default 1.56.1 +rustup default 1.57.0 rustup target add thumbv7neon-linux-androideabi rustup target add armv7-linux-androideabi rustup target add aarch64-linux-android diff --git a/prebuild.sh b/prebuild.sh index 1173e29d..917a32d3 100755 --- a/prebuild.sh +++ b/prebuild.sh @@ -244,6 +244,7 @@ ac_add_options --target=$target ac_add_options --with-android-min-sdk=$minsdk ac_add_options --with-android-ndk="$ANDROID_NDK" ac_add_options --with-android-sdk="$ANDROID_SDK" +ac_add_options --with-java-bin-path="/usr/bin" ac_add_options --with-gradle=$(command -v gradle) ac_add_options --with-wasi-sysroot="$wasi/build/install/wasi/share/wasi-sysroot" ac_add_options CC="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/$triplet-clang"