commit dc9de91d4cc648d1a73a86db745dcf6ae884afba
author android-build-team Robot <android-build-team-robot@google.com> Tue Dec 19 08:26:12 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Dec 19 08:26:12 2017 +0000
tree 6d6f5e64bea199ac1405d18de6aebaf6ec73e0ad
parent 340bbdb3d4c4d372ef55e50e468e4c90acbe4d46
parent 3abffbf9f375b9448f2cb35d921d0822bf928874

Snap for 4509671 from 3abffbf9f375b9448f2cb35d921d0822bf928874 to pi-release

Change-Id: I4f9d51a4db572e02dffdb4e5e1780f7732244454

robotests/Android.mk

diff --git a/robotests/Android.mk b/robotests/Android.mk
index c2e2a02..a6b854f 100644
--- a/robotests/Android.mk
+++ b/robotests/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-3.4.2-prebuilt \
+    platform-robolectric-3.5.1-prebuilt \
     telephony-common
 
 LOCAL_INSTRUMENTATION_FOR := KeyChain
@@ -38,10 +38,8 @@
 
 LOCAL_TEST_PACKAGE := KeyChain
 
-LOCAL_ROBOTEST_FILES := $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.)
-
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
 
 LOCAL_ROBOTEST_TIMEOUT := 36000
 
-include prebuilts/misc/common/robolectric/3.4.2/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk