Use new cmdline-tools with support for running sdkmanager and avdmanager with Java 8+.

This commit is contained in:
Yang Chen
2020-03-05 14:05:05 +11:00
committed by Yang
parent e1015a487b
commit 4a949058e2
9 changed files with 43 additions and 141 deletions
-8
View File
@@ -4,7 +4,6 @@ import { checkApiLevel, checkTarget, checkArch, checkDisableAnimations, checkEmu
import { launchEmulator, killEmulator } from './emulator-manager';
import * as exec from '@actions/exec';
import { parseScript } from './script-parser';
import { getCurrentJavaHome, getJavaHomeV8, setJavaHome } from './java-version-manager';
async function run() {
try {
@@ -66,10 +65,6 @@ async function run() {
console.log(`${script}`);
});
// use Java 8 for sdkmanager and avdmanager
const defaultJavaHome = await getCurrentJavaHome();
setJavaHome(await getJavaHomeV8());
// install SDK
await installAndroidSdk(apiLevel, target, arch, emulatorBuild);
@@ -80,9 +75,6 @@ async function run() {
core.setFailed(error.message);
}
// use default JAVA_HOME for running custom script
setJavaHome(defaultJavaHome);
// execute the custom script
try {
// move to custom working directory if set