PEMA-103 Updated Makefiles

Updated Makefile.conf to get the correct version of SequoiaBackend.
Removed hacky Cargo.toml replacement and changing 1.48 to 1.60 on rust toolchain.

android/external/Makefile.conf

@@ -41,7 +41,8 @@ NETTLE_VERSION=3.7.3
 
 ### Git deps repos
 EXTERNAL_GIT_REPOS += libetpan|https://gitea.pep.foundation/pEp.foundation/libetpan.git?507ab94fc9609432ef2d4c62770139482f1b5084
-EXTERNAL_GIT_REPOS += pEpEngineSequoiaBackend|https://gitea.pep.foundation/pEp.foundation/pEpEngineSequoiaBackend.git?81f582c64d295cac38941a15681c30758799c797
+# TODO PEMA-103 move this to not external anymore, it comes with the engine
+EXTERNAL_GIT_REPOS += pEpEngineSequoiaBackend|https://gitea.pep.foundation/pEp.foundation/pEpEngineSequoiaBackend.git?58887287fda1d0d076409a2e5f0f61844c9ee255
 
 ### Common variables
 #### Source code targets

android/external/MakefileTemplate

@@ -266,8 +266,6 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
 pEpEngineSequoiaBackend.src.stamp: ../downloads/pEpEngineSequoiaBackend.tar.gz
 	mkdir -p pEpEngineSequoiaBackend
 	cd pEpEngineSequoiaBackend && tar xvf ../$<
-	$(SED) -i 's,1.48.0,1.60.0,' pEpEngineSequoiaBackend/rust-toolchain
-	cp ../Cargo.toml.tmp pEpEngineSequoiaBackend/Cargo.toml
 	mkdir -p $(LOCAL)/lib/
 # This is a bad fix, we should move this to a common makefile (but not the .conf one)
 	find -L $(ANDROID_NDK) -name libunwind.a -execdir sh -c 'echo "INPUT(-lunwind)" > $(LOCAL)/lib/libgcc.a' \;