Merge branch 'swiftlang:main' into android-sleep-before-adb

Author: marcprux

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/scripts/android/android-emulator-tests.sh

@@ -99,6 +99,8 @@ nohup emulator -no-metrics -partition-size 1024 -memory 4096 -wipe-data -no-wind
 sleep 20
 
 log "Waiting for Android emulator startup"
+adb start-server
+sleep 5
 timeout "${ANDROID_EMULATOR_TIMEOUT}" adb wait-for-any-device
 
 log "Prepare Swift test package"

.github/workflows/swift_package_test.yml

@@ -648,7 +648,7 @@ jobs:
         run: ${{ inputs.linux_pre_build_command }}
       - name: Install Swift SDK for Android and build
         env:
-          BUILD_FLAGS: ${{ inputs.enable_android_sdk_checks && '--build-tests' }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
+          BUILD_FLAGS: ${{ inputs.enable_android_sdk_checks && '--build-tests' || '' }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
         shell: bash
         run: |
           ${{ inputs.android_sdk_pre_build_command }}