File tree Expand file tree Collapse file tree
.github/workflows/scripts/android Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -43,27 +43,15 @@ command -v sudo >/dev/null || install_package sudo
4343
4444# /usr/lib/jvm/java-17-openjdk-amd64
4545log " Installing Java"
46-
47- # JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/}
48- # if [[ ! -z "${JAVA_HOME}" ]]; then
49- # log "JAVA_HOME: ${JAVA_HOME}" || true
50- # fi
51-
52- log " Checking: /usr/lib/jvm/"
53- ls /usr/lib/jvm/ || true
54-
5546# Java packages are named different things on different distributions
56- install_package java-17-openjdk-devel || install_package openjdk-17-jdk || install_package java-openjdk17 || install_package java-17-amazon-corretto
57- which java || true
47+ command -v java > /dev/null || install_package java-17-openjdk-devel || install_package openjdk-17-jdk || install_package java-openjdk17 || install_package java-17-amazon-corretto
48+
49+ export PATH=${PATH} :/usr/lib/jvm/java/bin:/usr/lib/jvm/jre/bin
50+ command -v java
5851
59- # TODO: java-17-amazon-corretto does not add to JAVA_HOME
60- log " Checking: /usr/lib/jvm/"
61- ls /usr/lib/jvm/ || true
62- log " Checking: /usr/lib/jvm/java-17-amazon-corretto.x86_64"
63- ls /usr/lib/jvm/java-17-amazon-corretto.x86_64 || true
6452
6553log " Installing KVM"
66- install_package qemu-kvm || install_package kvm
54+ install_package qemu-kvm || install_package kvm || install_package @virt
6755
6856# download and install the Android SDK
6957log " Installing Android cmdline-tools"
You can’t perform that action at this time.
0 commit comments