From ee7b412c92b00fce5187d2eac27ebe9b3d6a3bb7 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 12 Oct 2018 17:43:10 +0100
Subject: [PATCH] Update robolectric dependency to v3.6.2.

This is required for support of v53 .class files.

Test: The following tests pass both before and after this CL:
      make RunFrameworksServicesRoboTests RunBluetoothRoboTests \
           RunCarMessengerRoboTests RunKeyChainRoboTests \
      RunManagedProvisioningRoboTests
Test: The above tests also pass when EXPERIMENTAL_USE_OPENJDK9=true
      (they didn't pass with v3.6.1).
Test: The following tests fail both before and after this CL (error
      trying to mock a final class):
      make RunStorageManagerRoboTests RunEmergencyInfoRoboTests

Bug: 116872534
Change-Id: I903a3448af1c0be55cc4af098521b3ba422c5579
---
 services/robotests/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk
index 3d7fdbdd74360..de54c4b537e45 100644
--- a/services/robotests/Android.mk
+++ b/services/robotests/Android.mk
@@ -80,7 +80,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-3.6.1-prebuilt
+    platform-robolectric-3.6.2-prebuilt
 
 LOCAL_INSTRUMENTATION_FOR := FrameworksServicesLib
 LOCAL_MODULE := FrameworksServicesRoboTests
@@ -105,4 +105,4 @@ LOCAL_TEST_PACKAGE := FrameworksServicesLib
 
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))backup/java
 
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk