diff --git a/.github/workflows/android-ubuntu-integration-test-actions.yaml b/.github/workflows/android-ubuntu-integration-test-actions.yaml index e456b1299..6af004959 100644 --- a/.github/workflows/android-ubuntu-integration-test-actions.yaml +++ b/.github/workflows/android-ubuntu-integration-test-actions.yaml @@ -56,13 +56,13 @@ jobs: - name: Set envs for arm64-v8a if: ${{ env.ABI == 'arm64-v8a' }} run: | - echo "AVD-ARCH=x86_64" >> $GITHUB_ENV + echo "AVD-ARCH=arm64-v8a" >> $GITHUB_ENV echo "NEXTEST-ABI=arm64" >> $GITHUB_ENV - name: Set envs for armeabi-v7a if: ${{ env.ABI == 'armeabi-v7a' }} run: | - echo "AVD-ARCH=x86" >> $GITHUB_ENV + echo "AVD-ARCH=arm64-v8a" >> $GITHUB_ENV echo "NEXTEST-ABI=arm32" >> $GITHUB_ENV - name: Remove unnecessary directories to free up space diff --git a/scripts/integration_tests_actions.sh b/scripts/integration_tests_actions.sh index 8c7d0ed27..6256c8d77 100644 --- a/scripts/integration_tests_actions.sh +++ b/scripts/integration_tests_actions.sh @@ -114,38 +114,18 @@ case "$abi" in x86_64) api_level_default="29" api_target_default="default" - if [ $intel_host_os == true ]; then - arch="x86_64" - else - arch="arm64-v8a" - fi ;; x86) api_level_default="29" api_target_default="default" - if [ $intel_host_os == true ]; then - arch="x86" - else - arch="arm64-v8a" - fi ;; arm64-v8a) api_level_default="29" api_target_default="default" - if [ $intel_host_os == true ]; then - arch="arm64-v8a" - else - arch="arm64-v8a" - fi ;; armeabi-v7a) api_level_default="29" api_target_default="default" - if [ $intel_host_os == true ]; then - arch="arm64-v8a" - else - arch="arm64-v8a" - fi ;; *) echo "Error: Invalid ABI" >&2