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

Commit 0c154bf6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adopt robolectric 3.6.1"

parents 84c699a4 0f5bba00

packages/SettingsLib/tests/robotests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 


LOCAL_JAVA_LIBRARIES := \

    junit \

    platform-robolectric-3.5.1-prebuilt

    platform-robolectric-3.6.1-prebuilt



LOCAL_INSTRUMENTATION_FOR := SettingsLibShell

LOCAL_MODULE := SettingsLibRoboTests
@@ -74,4 +74,4 @@ LOCAL_TEST_PACKAGE := SettingsLibShell 


LOCAL_ROBOTEST_TIMEOUT := 36000



include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk
 
include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk

services/robotests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 


LOCAL_JAVA_LIBRARIES := \

    junit \

    platform-robolectric-3.5.1-prebuilt

    platform-robolectric-3.6.1-prebuilt



LOCAL_INSTRUMENTATION_FOR := FrameworksServicesLib

LOCAL_MODULE := FrameworksServicesRoboTests
@@ -74,4 +74,4 @@ LOCAL_TEST_PACKAGE := FrameworksServicesLib 


LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))backup/java



include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk
 
include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk