diff options
Diffstat (limited to 'automated/android/noninteractive-tradefed/setup.sh')
| -rwxr-xr-x | automated/android/noninteractive-tradefed/setup.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/automated/android/noninteractive-tradefed/setup.sh b/automated/android/noninteractive-tradefed/setup.sh index 77a69f4..7406e0e 100755 --- a/automated/android/noninteractive-tradefed/setup.sh +++ b/automated/android/noninteractive-tradefed/setup.sh @@ -6,6 +6,12 @@ . ../../lib/android-test-lib JDK="openjdk-8-jdk-headless" +if [ -n "${ANDROID_VERSION}" ] && echo "${ANDROID_VERSION}" | grep -q "aosp-master"; then + # only use openjdk-11 for aosp master version + JDK="openjdk-11-jdk-headless" +#elif 8.1/9.0/android10 +# JDK="openjdk-8-jdk-headless" +fi PKG_DEPS="coreutils usbutils curl wget zip xz-utils python-lxml python-setuptools python-pexpect aapt lib32z1-dev libc6-dev-i386 lib32gcc1 libc6:i386 libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386 python-dev python-protobuf protobuf-compiler python-virtualenv python-pip python-pexpect psmisc" |