Extract rust_sdk_build.sh from rust_sdk_update.sh

Change-Id: I204f9de390ce9e37bf0dfd1815c758c609cce455

sc_tools/rust_sdk_build.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+GIT_ROOT="$(git rev-parse --show-toplevel)"
+SDK_DIR="$GIT_ROOT/../matrix-rust-sdk"
+COMPONENTS_DIR="$GIT_ROOT/../matrix-rust-components-kotlin"
+
+if [ ! -d "$SDK_DIR" ]; then
+    echo "SDK not found at $SDK_DIR"
+    exit 1
+fi
+if [ ! -d "$COMPONENTS_DIR" ]; then
+    echo "SDK components not found at $COMPONENTS_DIR"
+    exit 1
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+    JAVA_HOME=/opt/android-studio/jbr
+    if [ -d "$JAVA_HOME" ]; then
+        export JAVA_HOME
+    else
+        unset JAVA_HOME
+        echo "Warn: JAVA_HOME not set"
+    fi
+fi
+if [ -z "$ANDROID_NDK_HOME" ]; then
+    ANDROID_NDK_HOME="$HOME/AndroidSdk/ndk/25.2.9519653"
+    if [ -d "$ANDROID_NDK_HOME" ]; then
+        export ANDROID_NDK_HOME="$ANDROID_NDK_HOME"
+    else
+        unset ANDROID_NDK_HOME
+        echo "Warn: ANDROID_NDK_HOME not set"
+    fi
+fi
+echo "JAVA_HOME=$JAVA_HOME"
+echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME"
+
+cd "$COMPONENTS_DIR"
+./scripts/build.sh -p "$SDK_DIR" -r -m sdk -o "$GIT_ROOT"/libraries/rustsdk/matrix-rust-sdk.aar

sc_tools/rust_sdk_update.sh

@@ -17,27 +17,6 @@ if [ ! -d "$COMPONENTS_DIR" ]; then
     exit 1
 fi
 
-if [ -z "$JAVA_HOME" ]; then
-    JAVA_HOME=/opt/android-studio/jbr
-    if [ -d "$JAVA_HOME" ]; then
-        export JAVA_HOME
-    else
-        unset JAVA_HOME
-        echo "Warn: JAVA_HOME not set"
-    fi
-fi
-if [ -z "$ANDROID_NDK_HOME" ]; then
-    ANDROID_NDK_HOME="$HOME/AndroidSdk/ndk/25.2.9519653"
-    if [ -d "$ANDROID_NDK_HOME" ]; then
-        export ANDROID_NDK_HOME="$ANDROID_NDK_HOME"
-    else
-        unset ANDROID_NDK_HOME
-        echo "Warn: ANDROID_NDK_HOME not set"
-    fi
-fi
-echo "JAVA_HOME=$JAVA_HOME"
-echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME"
-
 cd "$GIT_ROOT"
 
 SDK_DIR="$(realpath "$SDK_DIR")"
@@ -73,5 +52,4 @@ git fetch upstream
 git merge "$sdk_revision" || read -p "Enter once conflicts are solved"
 
 echo "Build SDK..."
-cd "$COMPONENTS_DIR"
-./scripts/build.sh -p "$SDK_DIR" -r -m sdk -o "$GIT_ROOT"/libraries/rustsdk/matrix-rust-sdk.aar
+"$GIT_ROOT/sc_tools/rust_sdk_build.sh"