commit 076c3c4581c37b2c87c4805b3d6b64ef4c573616
author Sorin Basca <sorinbasca@google.com> Tue Nov 08 15:24:48 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 08 15:24:48 2022 +0000
tree 00f7d1683cb38a9ab7a6d6a5da3d86a8e50986a0
parent 8f21d7cc570cc3cb5960524a22994fbd4bbe71fb
parent bc4cc094c738a74761af23f13bd3848661c11149

Move robolectric tests from 3.6.2 to 4.8.2 am: bc4cc094c7

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/2292054

Change-Id: I85283e88e240acc2fc1b37ca0adb7f3a35535a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

robolectric_tests/Android.mk

diff --git a/robolectric_tests/Android.mk b/robolectric_tests/Android.mk
index 7d9b0e1..f5ab901 100644
--- a/robolectric_tests/Android.mk
+++ b/robolectric_tests/Android.mk
@@ -24,12 +24,13 @@
 LOCAL_SDK_VERSION := system_current
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    androidx.test.core \
     androidx.test.runner \
     androidx.test.rules \
     mockito-robolectric-prebuilt \
     truth-prebuilt
 LOCAL_JAVA_LIBRARIES := \
-    platform-robolectric-4.5.1-prebuilt
+    platform-robolectric-4.8.2-prebuilt
 
 LOCAL_JAVA_RESOURCE_DIRS := config
 
@@ -56,4 +57,4 @@
 
 LOCAL_ROBOTEST_TIMEOUT := 36000
 
-include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk
+include prebuilts/misc/common/robolectric/4.8.2/run_robotests.mk