From 06cc4deba5a78a63754421aff7dba303baf3cf67 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Tue, 28 Nov 2023 14:33:00 +0200 Subject: [PATCH] build: update Gradle Signed-off-by: Ahmed Moussa --- anoncred-kmm/anoncred-wrapper-rust/.cargo/config.toml | 8 ++++---- anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/anoncred-kmm/anoncred-wrapper-rust/.cargo/config.toml b/anoncred-kmm/anoncred-wrapper-rust/.cargo/config.toml index 94a9876e..d228cdcb 100644 --- a/anoncred-kmm/anoncred-wrapper-rust/.cargo/config.toml +++ b/anoncred-kmm/anoncred-wrapper-rust/.cargo/config.toml @@ -3,10 +3,10 @@ linker = "aarch64-linux-gnu-gcc" [target.x86_64-unknown-linux-gnu] linker = "x86_64-linux-gnu-gcc" [target.aarch64-linux-android] -linker = "aarch64-linux-android21-clang" +linker = "aarch64-linux-android21-clang++" [target.x86_64-linux-android] -linker = "x86_64-linux-android21-clang" +linker = "x86_64-linux-android21-clang++" [target.i686-linux-android] -linker = "i686-linux-android21-clang" +linker = "i686-linux-android21-clang++" [target.armv7-linux-androideabi] -linker = "armv7a-linux-androideabi21-clang" +linker = "armv7a-linux-androideabi21-clang++" diff --git a/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts b/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts index dab1c5ca..dae95664 100644 --- a/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts +++ b/anoncred-kmm/anoncred-wrapper-rust/build.gradle.kts @@ -183,7 +183,7 @@ val buildAnonCredWrapperForAndroidX8664 by tasks.register("buildAnonCredWr description = "Build and compile AnonCred Wrapper for Android X86_64" val localEnv = this.environment localEnv += mapOf( - "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP", + "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP:$TOOLCHAIN/bin/", "ANDROID_SDK" to ANDROID_SDK, "NDK" to NDK, "TOOLCHAIN" to TOOLCHAIN, @@ -205,7 +205,7 @@ val buildAnonCredWrapperForAndroidArch64 by tasks.register("buildAnonCredW description = "Build and compile AnonCred Wrapper for Android arch64" val localEnv = this.environment localEnv += mapOf( - "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP", + "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP:$TOOLCHAIN/bin/", "ANDROID_SDK" to ANDROID_SDK, "NDK" to NDK, "TOOLCHAIN" to TOOLCHAIN, @@ -231,7 +231,7 @@ val buildAnonCredWrapperForAndroidI686 by tasks.register("buildAnonCredWra description = "Build and compile AnonCred Wrapper for Android I686" val localEnv = this.environment localEnv += mapOf( - "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP", + "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP:$TOOLCHAIN/bin/", "ANDROID_SDK" to ANDROID_SDK, "NDK" to NDK, "TOOLCHAIN" to TOOLCHAIN, @@ -253,7 +253,7 @@ val buildAnonCredWrapperForAndroidArmv7a by tasks.register("buildAnonCredW description = "Build and compile AnonCred Wrapper for Android Armv7a" val localEnv = this.environment localEnv += mapOf( - "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP", + "PATH" to "${environment["PATH"]}:$TOOLCHAIN:$AR:$CC:$CXX:$LD:$RANLIB:$STRIP:$TOOLCHAIN/bin/", "ANDROID_SDK" to ANDROID_SDK, "NDK" to NDK, "TOOLCHAIN" to TOOLCHAIN,