Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 076c3c45 authored by Sorin Basca's avatar Sorin Basca Committed by Automerger Merge Worker
Browse files

Move robolectric tests from 3.6.2 to 4.8.2 am: bc4cc094 

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



Change-Id: I85283e88e240acc2fc1b37ca0adb7f3a35535a2a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f21d7cc bc4cc094

robolectric_tests/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ LOCAL_LICENSE_CONDITIONS := notice 
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_INSTRUMENT_SOURCE_DIRS := packages/apps/ThemePicker/src \ 


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