commit a537578498da2b7e42a9636d9064d13df9703316
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 27 17:02:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 27 17:02:19 2018 +0000
tree d8657c3d73fa5140facfcb56c975dc64f588d0b1
parent 12daab5597f45be6272ee5782c5f363d89bf38b7
parent a3fd1e5bfeadfab722879a545f09ea2630fbb3d7

Merge "Fixing AOSP tests after AndroidX migration" into ub-launcher3-master

build.gradle

diff --git a/build.gradle b/build.gradle
index dcb5b81..7ac4127 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index ec89f9c..0be5f11 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -28,7 +28,7 @@
     <instrumentation
         android:functionalTest="false"
         android:handleProfiling="false"
-        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.launcher3" >
     </instrumentation>
 </manifest>