From 0f5bba003bbce3efe558ab3969570a613bf1f386 Mon Sep 17 00:00:00 2001 From: James Lemieux Date: Thu, 4 Jan 2018 17:45:28 -0800 Subject: [PATCH] Adopt robolectric 3.6.1 Bug: 71596155 Test: make RunSettingsLibRoboTests Change-Id: I0f8e538238c42fed89bc4778a6a717f2eddac9b7 --- packages/SettingsLib/tests/robotests/Android.mk | 4 ++-- services/robotests/Android.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SettingsLib/tests/robotests/Android.mk b/packages/SettingsLib/tests/robotests/Android.mk index 02a49738e6a1d..7cf7163058874 100644 --- a/packages/SettingsLib/tests/robotests/Android.mk +++ b/packages/SettingsLib/tests/robotests/Android.mk @@ -49,7 +49,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \ junit \ - platform-robolectric-3.5.1-prebuilt + platform-robolectric-3.6.1-prebuilt LOCAL_INSTRUMENTATION_FOR := SettingsLibShell LOCAL_MODULE := SettingsLibRoboTests @@ -74,4 +74,4 @@ LOCAL_TEST_PACKAGE := SettingsLibShell LOCAL_ROBOTEST_TIMEOUT := 36000 -include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk +include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk index 1ca6f26dfe214..ae311f841fd03 100644 --- a/services/robotests/Android.mk +++ b/services/robotests/Android.mk @@ -49,7 +49,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 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_TEST_PACKAGE := FrameworksServicesLib 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