commit 34c62537789534a5aad9fa1cf723078e75d34cdb
author Priyanka Advani <padvani@google.com> Thu Mar 21 20:08:08 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 20:08:08 2024 +0000
tree 228f9d723d3cf926224eb9fd37225c044f845b1f
parent ee7a06946721a2711a90a68dc52bf3deda0f64a5
parent c041b5c625cefe5c9f87d3a969ebdb1fa13db2cc

Merge changes from topic "revert-26605558-robolectric-enable-androidx-rules-OWMAZEJUYZ" into main

* changes:
  Revert "Include AndroidX test rules in Robolectric tests"
  Revert "Move FastBitmapDrawableTest to Robolectric"

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index eeafdba..3a9f4ad 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -206,7 +206,6 @@
         "androidx.test.uiautomator_uiautomator",
         "androidx.core_core-animation-testing",
         "androidx.test.ext.junit",
-        "androidx.test.rules",
         "mockito-robolectric-prebuilt",
         "mockito-kotlin2",
         "platform-parametric-runner-lib",

tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java

diff --git a/tests/multivalentTests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java b/tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java
similarity index 100%
rename from tests/multivalentTests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java
rename to tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java