Skip to content

Switch Android CI java build to JDK 11 #6552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guoyu-wang merged 3 commits into from
Feb 4, 2021
Merged

Switch Android CI java build to JDK 11 #6552

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb701a6
switch to jdk11
guoyu-wang Feb 2, 2021
4cbc693
fix java
guoyu-wang Feb 3, 2021
c1f7ebf
Update
guoyu-wang Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,26 @@ jobs:
--emulator-pid-file $(Build.BinariesDirectory)/emulator.pid
displayName: Start Android emulator

- script: python3 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 --cmake_generator=Ninja --build_java
# Start switching to jdk 11 after the Android Emulator is started since Android SDK manager requires java 8
- task: JavaToolInstaller@0
Copy link
Member

@yuslepukhin yuslepukhin Feb 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

task: JavaToolInstaller@0 [](start = 4, length = 25)

Will this execute once?

Copy link
Contributor Author

@guoyu-wang guoyu-wang Feb 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this task is actually setting the environment variables

displayName: Use jdk 11
inputs:
versionSpec: '11'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'

- script: |
python3 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 \
--cmake_generator=Ninja \
--build_java
displayName: CPU EP, Build and Test on Android Emulator

- script: /bin/bash tools/ci_build/github/android/run_nnapi_code_coverage.sh $(pwd)
Expand Down