rust-lang setup improvements:

* Use CARGO_HOME and RUSTUP_HOME
* Install the proper toolchains

Author: astonbitecode

rust-build/build_rust_for_rust_keylock_android.sh

@@ -5,6 +5,11 @@ cd $BASEDIR/../
 BASEDIR=`pwd`
 echo Entered Base directory $BASEDIR
 
+# Add cargo to the path
+CARGO_HOME=$BASEDIR/tools/.cargo
+RUSTUP_HOME=$BASEDIR/tools/.rustup
+PATH=$PATH:$CARGO_HOME/bin
+
 ANDROID_RUST="$BASEDIR/rust"
 ANDROID_RUST_KEYLOCK_LIB="$ANDROID_RUST/target/arm-linux-androideabi/release/librustkeylockandroid.so"
 ANDROID_JAVA_NATIVE="$BASEDIR/java/libs/armeabi/"
@@ -15,4 +20,4 @@ xargo build --target=arm-linux-androideabi --release
 echo "Copying $ANDROID_RUST_KEYLOCK_LIB to $ANDROID_JAVA_NATIVE"
 cp $ANDROID_RUST_KEYLOCK_LIB $ANDROID_JAVA_NATIVE
 
-echo "Rust build for rust-keylock-android completed."
+echo "Rust build for rust-keylock-android completed."

rust-build/pre_build_rust_keylock_android.sh

@@ -5,14 +5,18 @@ cd $BASEDIR/../
 BASEDIR=`pwd`
 echo Base directory is $BASEDIR
 
-# Save the current HOME variable and override it with a subdirectory
-mkdir home
-HOME_BAK=$HOME
-HOME=$BASEDIR/home
+# Set the home directories for cargo and rustup
+mkdir -p tools/.cargo
+mkdir -p tools/.rustup
+CARGO_HOME=$BASEDIR/tools/.cargo
+RUSTUP_HOME=$BASEDIR/tools/.rustup
 
 # Install the latest rust stable and cargo
-`curl https://sh.rustup.rs -sSf | sh -s -- -y`
-PATH=$PATH:$HOME/.cargo/bin
+`curl https://sh.rustup.rs -sSf | CARGO_HOME=$BASEDIR/tools/.cargo RUSTUP_HOME=$BASEDIR/tools/.rustup sh -s -- -y`
+PATH=$PATH:$CARGO_HOME/bin
+
+rustup default stable
+rustup target add arm-linux-androideabi
 
 # Install xargo
 cargo install xargo --force