From 681ac5bcc31b8df3ea2d230bf62bcc0cb7780d5e Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Thu, 7 Jun 2018 13:12:50 -0700
Subject: [PATCH] Fix Robolectric tests

Test: atest RunSettingsRoboTests
Change-Id: I66a6d1c42d57685c4beb9daeb534685c5cdd9c50
---
 .../settings/testutils/SettingsRobolectricTestRunner.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index f071f173633..0b29af58bad 100644
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -84,9 +84,9 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
             paths.add(new ResourcePath(null,
                 Fs.fromURL(new URL("file:frameworks/opt/setupwizard/library/recyclerview/res")), null));
             paths.add(new ResourcePath(null,
-                Fs.fromURL(new URL("file:frameworks/support/v7/appcompat/res")), null));
+                Fs.fromURL(new URL("file:frameworks/support/appcompat/res")), null));
             paths.add(new ResourcePath(null,
-                Fs.fromURL(new URL("file:frameworks/support/v7/cardview/res")), null));
+                Fs.fromURL(new URL("file:frameworks/support/cardview/res")), null));
         } catch (MalformedURLException e) {
             throw new RuntimeException("SettingsRobolectricTestRunner failure", e);
         }