commit 0f5bba003bbce3efe558ab3969570a613bf1f386
author James Lemieux <jplemieux@google.com> Thu Jan 04 17:45:28 2018 -0800
committer James Lemieux <jplemieux@google.com> Sat Jan 06 00:28:25 2018 -0800
tree bf4aa590d21c4a3927535ab053c53927ec17e94f
parent bf1b0b04bf135586a24b57de0ab7eca20e4d5fe3

Adopt robolectric 3.6.1

Bug: 71596155
Test: make RunSettingsLibRoboTests
Change-Id: I0f8e538238c42fed89bc4778a6a717f2eddac9b7

services/robotests/Android.mk

diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk
index 1ca6f26..ae311f8 100644
--- a/services/robotests/Android.mk
+++ b/services/robotests/Android.mk
@@ -49,7 +49,7 @@
 
 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_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