chore: interop: allow concurrent runs on the same machine

Before we hadn't provided a concrete device name, so adb couldn't figure
out which one to use in case there were multiple.

Author: SimonThormeyer

interop/src/clients/corecrypto/android.rs

@@ -196,15 +196,10 @@ impl CoreCryptoAndroidClient {
         let client_id_base64 = general_purpose::STANDARD.encode(client_id_str.as_str());
         let ciphersuite = CIPHERSUITE_IN_USE as u16;
 
-        let output = Command::new("adb")
-            .args(["get-serialno"])
-            .output()
-            .expect("Failed to get connected android device");
-
-        let device = String::from_utf8(output.stdout)
-            .expect("output is not valid utf8")
-            .trim()
-            .to_string();
+        let device = std::env::var_os("ADB_DEVICE")
+            .expect("ADB_DEVICE must be set")
+            .into_string()
+            .expect("ADB_DEVICE must have valid string encoding");
         let driver = SimulatorDriver::new(device, "com.wire.androidinterop".into());
         log::info!("initialising core crypto with ciphersuite {ciphersuite}");
         driver

scripts/run-interop-test.sh

@@ -5,6 +5,9 @@ cd $scripts
 
 TARGET_NAME=$1
 
+export ADB_DEVICE_PORT=$((27000 + $(id -u)))
+export ADB_DEVICE=emulator-$ADB_DEVICE_PORT
+
 OS="$(uname -s)"
 
 cleanup() {

scripts/start-android-emulator.sh

@@ -9,8 +9,6 @@ AVD_NAME=test-phone
 # multiple jobs running at the same time, all using the same adb server, and
 # therefore seeing the same emulator devices. To avoid that, just pick a port
 # based on current user's ID.
-PORT=$((27000 + $(id -u)))
-ADB_DEVICE=emulator-$PORT
 
 # PATH updates
 export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator:$PATH
@@ -44,7 +42,7 @@ fi
 # not be running on our self-hosted runners.
 adb start-server
 
-emulator -avd $AVD_NAME -port $PORT -no-window -gpu swiftshader_indirect \
+emulator -avd $AVD_NAME -port $ADB_DEVICE_PORT -no-window -gpu swiftshader_indirect \
          -no-snapshot -noaudio -no-boot-anim -no-metrics >$logfile &
 EMULATOR_PID=$!