Stabilize instrumentation boot and dependency injection

Author: shai-almog

scripts/build-android-app.sh

@@ -449,6 +449,31 @@ wait_for_emulator() {
   return 0
 }
 
+wait_for_package_service() {
+  local serial="$1"
+  local timeout="${PACKAGE_SERVICE_TIMEOUT:-120}"
+  if ! [[ "$timeout" =~ ^[0-9]+$ ]] || [ "$timeout" -le 0 ]; then
+    timeout=120
+  fi
+  local deadline=$((SECONDS + timeout))
+  local last_log=$SECONDS
+  while [ $SECONDS -lt $deadline ]; do
+    if "$ADB_BIN" -s "$serial" shell cmd package list packages >/dev/null 2>&1; then
+      return 0
+    fi
+    if "$ADB_BIN" -s "$serial" shell pm list packages >/dev/null 2>&1; then
+      return 0
+    fi
+    if [ $((SECONDS - last_log)) -ge 10 ]; then
+      ba_log "Waiting for package manager service on $serial"
+      last_log=$SECONDS
+    fi
+    sleep 2
+  done
+  ba_log "Package manager service not ready on $serial after ${timeout}s" >&2
+  return 1
+}
+
 stop_emulator() {
   if [ -n "${EMULATOR_SERIAL:-}" ]; then
     "$ADB_BIN" -s "$EMULATOR_SERIAL" emu kill >/dev/null 2>&1 || true
@@ -556,6 +581,11 @@ if ! wait_for_emulator "$EMULATOR_SERIAL"; then
   exit 1
 fi
 
+if ! wait_for_package_service "$EMULATOR_SERIAL"; then
+  stop_emulator
+  exit 1
+fi
+
 UI_TEST_TIMEOUT_SECONDS="${UI_TEST_TIMEOUT_SECONDS:-900}"
 if ! [[ "$UI_TEST_TIMEOUT_SECONDS" =~ ^[0-9]+$ ]] || [ "$UI_TEST_TIMEOUT_SECONDS" -le 0 ]; then
   ba_log "Invalid UI_TEST_TIMEOUT_SECONDS=$UI_TEST_TIMEOUT_SECONDS provided; falling back to 900"

scripts/update_android_ui_test_gradle.py

@@ -173,13 +173,22 @@ def _has_dependency(block: str, coordinate: str) -> bool:
         )
 
     def _find_dependencies_block(self) -> tuple[int, int] | None:
+        preferred: tuple[int, int] | None = None
+        fallback: tuple[int, int] | None = None
         for name, start, end, parents in self._iter_blocks():
             if name != "dependencies":
                 continue
             if parents and parents[-1] in {"buildscript", "pluginManagement"}:
                 continue
-            return start, end
-        return None
+            block_content = self.content[start:end]
+            if re.search(r"^\s*(implementation|api|compile|androidTestImplementation|androidTestCompile)\b", block_content, re.MULTILINE):
+                preferred = (start, end)
+                break
+            if "classpath" in block_content and not re.search(r"^\s*(implementation|api|compile)\b", block_content, re.MULTILINE):
+                continue
+            if fallback is None:
+                fallback = (start, end)
+        return preferred or fallback
 
     def _append_dependencies_block(self) -> None:
         if not self.content.endswith("\n"):