diff options
| author | David Yu <dyu@google.com> | 2024-05-02 21:06:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-02 21:06:08 +0000 |
| commit | c2f18acd5b0b667c13071dfeacdecef9ec6b0015 (patch) | |
| tree | 80491f9f82d6e1e09836b8cb87308cdf9e902af3 | |
| parent | 685473b720fbd9331a62703e3cd6903152d8375d (diff) | |
| parent | 601d0b4001351c429cfb2339137267f09a6d3545 (diff) | |
| download | adt-infra-emu-master-dev.tar.gz | |
Merge "Set JAVA_HOME to use the prebuilt java version." into emu-master-devemu-master-dev
| -rwxr-xr-x | emu_test/utils/run_sys_img_test.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/emu_test/utils/run_sys_img_test.sh b/emu_test/utils/run_sys_img_test.sh index d7eb0181..97905c47 100755 --- a/emu_test/utils/run_sys_img_test.sh +++ b/emu_test/utils/run_sys_img_test.sh @@ -38,6 +38,7 @@ function run_with_timeout () { TARGET="$(echo $DIST_DIR | sed "s/.*git_devtools-test-.*-\(api.*\)\/.*/\1/g")" export ADT_INFRA='/buildbot/src/android/emu-master-dev/external/adt-infra' export ANDROID_SDK_ROOT="$SDK_EMULATOR" +export JAVA_HOME="$PWD/prebuilts/studio/jdk/jdk17/linux/" rm -rf "$ANDROID_SDK_ROOT/system-images" ln -sf "/buildbot/src/android/emu-master-dev/prebuilts/android-emulator-build/system-images/linux/system-images" "$ANDROID_SDK_ROOT" ls $SDK_EMULATOR |