diff --git a/metadata/org.astonbitecode.rustkeylock.yml b/metadata/org.astonbitecode.rustkeylock.yml index d0072aa3f0..f94f9e1cbc 100644 --- a/metadata/org.astonbitecode.rustkeylock.yml +++ b/metadata/org.astonbitecode.rustkeylock.yml @@ -282,10 +282,9 @@ Builds: - cp $ANDROID_RUST_KEYLOCK_LIB_ARMV7 $ANDROID_JAVA_NATIVE_ARMV7 ndk: r25c - - versionName: 0.16.1 - versionCode: 1600 - disable: incomplete recipe - commit: 99b970ea6e7f34c2bca374c95096797037a26e69 + - versionName: 0.16.2 + versionCode: 1602 + commit: b1450b9fc4417eaa0672ac05be03ae86617b9760 subdir: App sudo: - apt-get update @@ -306,16 +305,16 @@ Builds: - cd $HOME - mkdir -p .cargo - cd .cargo - - printf "[target]\n [target.armv7-linux-androideabi]\n linker = \"${ANDROID_TOOLCHAIN_DIR}/bin/armv7a-linux-androideabi24-clang\"\n - [target.aarch64-linux-android]\n linker = \"${ANDROID_TOOLCHAIN_DIR}/bin/aarch64-linux-android24-clang\"" - > config + - printf "[target]\n [target.armv7-linux-androideabi]\n linker = \"${ANDROID_TOOLCHAIN_DIR}/bin/armv7a-linux-androideabi32-clang\"\n + [target.aarch64-linux-android]\n linker = \"${ANDROID_TOOLCHAIN_DIR}/bin/aarch64-linux-android32-clang\"" + > config.toml - export ANDROID_TOOLCHAIN=$ANDROID_TOOLCHAIN_DIR/bin - export ANDROID_NDK_ROOT=${ANDROID_NDK} - export ANDROID_RUST="$BASEDIR/rust" - export ANDROID_RUST_KEYLOCK_LIB_AARCH64="$ANDROID_RUST/target/aarch64-linux-android/release/librustkeylockandroid.so" - export ANDROID_RUST_KEYLOCK_LIB_ARMV7="$ANDROID_RUST/target/armv7-linux-androideabi/release/librustkeylockandroid.so" - - export ANDROID_JAVA_NATIVE_AARCH64="$BASEDIR/app/src/main/jniLibs/arm64-v8a/" - - export ANDROID_JAVA_NATIVE_ARMV7="$BASEDIR/app/src/main/jniLibs/armeabi-v7a/" + - export ANDROID_JAVA_NATIVE_AARCH64="$BASEDIR/App/src/main/jniLibs/arm64-v8a/" + - export ANDROID_JAVA_NATIVE_ARMV7="$BASEDIR/App/src/main/jniLibs/armeabi-v7a/" - mkdir -p $ANDROID_JAVA_NATIVE_AARCH64 - mkdir -p $ANDROID_JAVA_NATIVE_ARMV7 - . $BASEDIR/rust-build/setenv-android.sh @@ -332,5 +331,5 @@ Builds: AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: 0.16.1 -CurrentVersionCode: 1600 +CurrentVersion: 0.16.2 +CurrentVersionCode: 1602