diff --git a/tools/ci_build/github/android/start_android_emulator.sh b/tools/ci_build/github/android/start_android_emulator.sh index 5eeb629cae..c24ca7b0e0 100755 --- a/tools/ci_build/github/android/start_android_emulator.sh +++ b/tools/ci_build/github/android/start_android_emulator.sh @@ -3,9 +3,9 @@ set -e -echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-28;google_apis;x86_64' +echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-29;google_apis;x86_64' -echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n android_emulator -k 'system-images;android-28;google_apis;x86_64' --force +echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n android_emulator -k 'system-images;android-29;google_apis;x86_64' --force echo "Starting emulator" diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index f28bbef196..16468909ff 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -1,15 +1,9 @@ jobs: - job: Android_CI - pool: - vmImage: 'macOS-10.14' + pool: + vmImage: 'macOS-10.15' steps: - # cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515. pip install cmake==3.13.2 installs 3.12.2 - - script: pip install cmake==3.13.2.post1 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install coreutils - displayName: Install cmake 3.14 and coreutils - - script: 'git submodule update --init --recursive --progress' - displayName: Clone submodules - - script: echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'ndk-bundle' - displayName: Install Android NDK - - script: tools/ci_build/build.py --android --build_dir build --android_sdk_path $ANDROID_HOME --android_ndk_path $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --skip_submodule_sync --parallel --use_dnnlibrary + - script: brew install coreutils + displayName: Install coreutils + - script: tools/ci_build/build.py --android --build_dir build --android_sdk_path $ANDROID_HOME --android_ndk_path $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --android_api=29 --skip_submodule_sync --parallel --use_nnapi displayName: Build and Test on Android Emulator -