aboutsummaryrefslogtreecommitdiff
path: root/automated/android
diff options
context:
space:
mode:
authorJulien Duraj <julien.duraj@linaro.org>2020-06-16 14:21:13 +0100
committerJulien Duraj <julien.duraj@linaro.org>2020-06-16 14:27:58 +0100
commit81e201de7884e4d6d5e38a447338275a9062322b (patch)
tree017aa74709bfa9b9578b712c31647514e5191c2e /automated/android
parent5558c6d028e98485e0c2269c01113f6de7ffcd91 (diff)
ART benchmarks: switch to manifest prebuilt sdk
Diffstat (limited to 'automated/android')
-rw-r--r--automated/android/microbenchmarks/manifest.xml3
-rwxr-xr-xautomated/android/microbenchmarks/microbenchmarks.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/automated/android/microbenchmarks/manifest.xml b/automated/android/microbenchmarks/manifest.xml
index 60848b4..7060c04 100644
--- a/automated/android/microbenchmarks/manifest.xml
+++ b/automated/android/microbenchmarks/manifest.xml
@@ -19,6 +19,9 @@
<!-- ART target for running art target tests" -->
<project path="device/generic/art" name="device/generic/art" />
+ <!-- Add prebuilt jdk to build benchmarks -->
+ <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" upstream="master"/>
+
<project path="build/make" name="platform/build" groups="pdk">
<copyfile src="core/root.mk" dest="Makefile" />
<linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
diff --git a/automated/android/microbenchmarks/microbenchmarks.sh b/automated/android/microbenchmarks/microbenchmarks.sh
index 5c21f66..917d9b6 100755
--- a/automated/android/microbenchmarks/microbenchmarks.sh
+++ b/automated/android/microbenchmarks/microbenchmarks.sh
@@ -26,7 +26,7 @@ set -x
# shellcheck disable=SC1091
. ../../lib/android-test-lib
-PKG_DEPS="git wget binutils curl bc xz-utils python python3 python3-scipy openjdk-8-jdk"
+PKG_DEPS="git wget binutils curl bc xz-utils python python3 python3-scipy"
SKIP_INSTALL="false"