Skip to content

Commit 2105712

Browse files
committed
Support down to SDK version 16
1 parent a0a9f71 commit 2105712

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

java/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
<dependency>
4242
<groupId>io.github.astonbitecode</groupId>
4343
<artifactId>j4rs</artifactId>
44-
<version>0.3.0</version>
45-
<classifier>java7</classifier>
44+
<version>0.3.0-java7</version>
4645
</dependency>
4746
<!-- Test dependencies -->
4847
<dependency>

rust-build/build_rust_for_rust_keylock_android.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mkdir -p $ANDROID_JAVA_NATIVE
2020
cd $ANDROID_RUST
2121

2222
ANDROID_TOOLCHAIN_DIR=$BASEDIR/android-toolchain
23-
OPENSSL_BUILD_DIR=$BASEDIR/tools/openssl-1.1.0j/build
23+
OPENSSL_BUILD_DIR=$BASEDIR/tools/openssl-1.1.0g/build
2424
CC="${ANDROID_TOOLCHAIN_DIR}/bin/arm-linux-androideabi-gcc" AR="${ANDROID_TOOLCHAIN_DIR}/bin/arm-linux-androideabi-ar" OPENSSL_DIR=${OPENSSL_BUILD_DIR} OPENSSL_LIB_DIR=${OPENSSL_BUILD_DIR}/lib OPENSSL_INCLUDE_DIR=${OPENSSL_BUILD_DIR}/include OPENSSL_STATIC=true $CARGO_HOME/bin/cargo build --target=arm-linux-androideabi --release
2525

2626
echo "Copying $ANDROID_RUST_KEYLOCK_LIB to $ANDROID_JAVA_NATIVE"

rust-build/pre_build_rust_keylock_android.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ export ANDROID_NDK_ROOT=${ANDROID_NDK}
7575

7676
cd $BASEDIR/tools
7777

78-
curl -O https://www.openssl.org/source/openssl-1.1.0j.tar.gz
79-
tar xzf openssl-1.1.0j.tar.gz
78+
curl -O https://www.openssl.org/source/openssl-1.1.0g.tar.gz
79+
tar xzf openssl-1.1.0g.tar.gz
8080

81-
export OPENSSL_SRC_DIR=$BASEDIR/tools/openssl-1.1.0j
81+
export OPENSSL_SRC_DIR=$BASEDIR/tools/openssl-1.1.0g
8282

8383
# Delete the mandroid flag as clang does not recognize it
8484
sed -i 's/-mandroid //g' ${OPENSSL_SRC_DIR}/Configurations/10-main.conf

0 commit comments

Comments
 (0)