From 19d3597bf2d4d8857a3b3b97cad5eaf193a68f49 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 2 Aug 2018 16:02:13 -0700 Subject: [PATCH] Fix robo tests We are pointing to intermediate built files for resource. We should instead just remove the ResourcePath list and let Robolectric extract res files from built apk (supported in a newer version or robolectric) Change-Id: Iaed2160518b90a8a678c8526295dcfa74c8e3c42 Fixes: 112160027 Test: robotests --- .../com/android/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 98693e3e44..ad808fcd8d 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/appcompat/res")), null)); + Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.appcompat_appcompat-nodeps/android_common/aar/res/")), null)); paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/support/cardview/res")), null)); + Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.cardview_cardview-nodeps/android_common/aar/res")), null)); } catch (MalformedURLException e) { throw new RuntimeException("SettingsRobolectricTestRunner failure", e); } -- 2.11.0