summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2018-01-11 12:46:45 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2018-01-11 12:47:52 +0530
commitd192ef809a1a69278cf6ba68e31f2abdb2c777ec (patch)
tree79ddf388f108b7c5de4673a6d0b9aa2ebbee0ae3
parent7c59f20fec7349a87a9b33a0d199c7e715d4ba64 (diff)
tradefed: install jdk9 for aosp master
We need jdk9 for AOSP master but jdk8 for Oreo Change-Id: If36be50e14bb855943fcc87abd7b35601c63ef74 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rwxr-xr-xautomated/android/tradefed/tradefed.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/automated/android/tradefed/tradefed.sh b/automated/android/tradefed/tradefed.sh
index 31f64e7..389eebc 100755
--- a/automated/android/tradefed/tradefed.sh
+++ b/automated/android/tradefed/tradefed.sh
@@ -48,6 +48,10 @@ wait_boot_completed "${TIMEOUT}"
# sufficient.
# wait_homescreen "${TIMEOUT}"
+if [ "$ANDROID_VERSION" = "AOSP MASTER" ]; then
+ install_deps openjdk-9-jdk-headless
+fi
+
# Increase the heap size. KVM devices in LAVA default to ~250M of heap
export _JAVA_OPTIONS="-Xmx350M"
java -version