commit e18902ec6764e138cd4bb5a452a9c25736764252
author Maurice Lam <yukl@google.com> Wed Sep 20 22:20:22 2017 -0700
committer Maurice Lam <yukl@google.com> Fri Sep 22 18:34:00 2017 +0000
tree 31c09821a2ec2f7e3b688273757a9b3f58f5fe6e
parent d0b1297e840f2346d68a5ce4a61b3ac9719b9dcc

Update Robolectric to 3.4.2

Bug: 66693279
Test: m RunSettingsRoboTests
      m RunSettingsRoboTests-jacoco
Change-Id: I9df619c3d68f0af2ee2ae944a15998275129f7c2

tests/robotests/Android.mk

diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index ae0102f..97e5e04 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -9,12 +9,12 @@
 # Include the testing libraries (JUnit4 + Robolectric libs).
 LOCAL_STATIC_JAVA_LIBRARIES := \
     mockito-robolectric-prebuilt \
+    platform-robolectric-android-all-stubs \
     truth-prebuilt
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-prebuilt \
-    sdk_vcurrent \
+    platform-robolectric-3.4.2-prebuilt \
     telephony-common
 
 LOCAL_INSTRUMENTATION_FOR := Settings
@@ -40,4 +40,6 @@
 
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
 
-include prebuilts/misc/common/robolectric/run_robotests.mk
\ No newline at end of file
+LOCAL_ROBOTEST_TIMEOUT := 36000
+
+include prebuilts/misc/common/robolectric/3.4.2/run_robotests.mk