commit 22a39c2b93bc66db71238274a7683d329232d124
author James Lemieux <jplemieux@google.com> Mon Feb 26 00:51:42 2018 -0800
committer James Lemieux <jplemieux@google.com> Sun Mar 04 03:50:08 2018 -0800
tree 2a943ac16aa13c945d65943d9d65da9e2dcca5e5
parent 229a6a2bc446d0102dcd330f077ca3e53c5ea7d3

Use external/robolectric-shadows/run_robotests.mk

This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7

tests/robotests/Android.mk

diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index e73c323..102e8da 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -1,40 +1,40 @@
 #############################################
-# Settings Robolectric test target. #
+# Settings Robolectric test target.         #
 #############################################
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := SettingsRoboTests
+
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-# Include the testing libraries (JUnit4 + Robolectric libs).
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-robolectric-prebuilt \
-    platform-robolectric-android-all-stubs \
-    truth-prebuilt
+LOCAL_JAVA_RESOURCE_DIRS := config
 
 LOCAL_JAVA_LIBRARIES := \
-    junit \
-    platform-robolectric-3.6.1-prebuilt \
-    telephony-common
+    robolectric_android-all-stub \
+    Robolectric_all-target \
+    mockito-robolectric-prebuilt \
+    truth-prebuilt
 
 LOCAL_INSTRUMENTATION_FOR := Settings
-LOCAL_MODULE := SettingsRoboTests
 
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 #############################################################
-# Settings runner target to run the previous target. #
+# Settings runner target to run the previous target.        #
 #############################################################
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := RunSettingsRoboTests
 
-LOCAL_SDK_VERSION := current
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    SettingsRoboTests
+LOCAL_JAVA_LIBRARIES := \
+    SettingsRoboTests \
+    robolectric_android-all-stub \
+    Robolectric_all-target \
+    mockito-robolectric-prebuilt \
+    truth-prebuilt
 
 LOCAL_TEST_PACKAGE := Settings
 
@@ -42,4 +42,4 @@
 
 LOCAL_ROBOTEST_TIMEOUT := 36000
 
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
+include external/robolectric-shadows/run_robotests.mk
\ No newline at end of file