Merge "Update robolectric dependency to v3.6.2." am: cc54c93376

am: 9ff0f548a9

Change-Id: I79a5efd92491c4d4ebcd16cd9d4fe9705760e483
This commit is contained in:
Tobias Thierer
2018-10-15 21:19:36 -07:00
committed by android-build-merger

View File

@@ -80,7 +80,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
LOCAL_JAVA_LIBRARIES := \
junit \
platform-robolectric-3.6.1-prebuilt
platform-robolectric-3.6.2-prebuilt
LOCAL_INSTRUMENTATION_FOR := FrameworksServicesLib
LOCAL_MODULE := FrameworksServicesRoboTests
@@ -105,4 +105,4 @@ LOCAL_TEST_PACKAGE := FrameworksServicesLib
LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))backup/java
include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk