commit a3fd1e5bfeadfab722879a545f09ea2630fbb3d7
author Vadim Tryshev <vadimt@google.com> Fri Aug 24 17:48:25 2018 -0700
committer Vadim Tryshev <vadimt@google.com> Fri Aug 24 17:48:38 2018 -0700
tree b192322523df5c66ae92adf0814034d72a029f7b
parent 98afc964614dc98e5ed6b8b22cd69155b2ba43f1

Fixing AOSP tests after AndroidX migration

Test: adb shell am instrument -w -r -e debug false com.android.launcher3.tests/androidx.test.runner.AndroidJUnitRunner
Change-Id: I72bf7095087b012a6eceac71ee02f2d7a5c8c51b

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>