build: update Gradle

Signed-off-by: Ahmed Moussa <ahmed.moussa@iohk.io>
input-output-hk · Nov 28, 2023 · 06cc4de · 06cc4de
1 parent 1ed048f
commit 06cc4de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -183,7 +183,7 @@ val buildAnonCredWrapperForAndroidX8664 by tasks.register<Exec>("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<Exec>("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<Exec>("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<Exec>("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,