Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adopt robolectric 3.6.1

Browse Source 
Bug: 71596155
Test: make RunSettingsLibRoboTests
Change-Id: I0f8e538238c42fed89bc4778a6a717f2eddac9b7
This commit is contained in:
James Lemieux
2018-01-04 17:45:28 -08:00
parent bf1b0b04bf
commit 0f5bba003b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/tests/robotests/Android.mk
View File

@@ -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

4
services/robotests/Android.mk
View File

@@ -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