From 17bc63767f5983df92bfce52b3a123a7b7b59b24 Mon Sep 17 00:00:00 2001
From: KOUSHIK PANUGANTI <kpanuganti@google.com>
Date: Mon, 17 Dec 2018 18:40:30 -0800
Subject: [PATCH] Migrate frameworks/base/location/tests/locationtests to
 androidx.test

See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: I95ad03e062e383d09e08c6f80f838d208080970c
---
 location/tests/locationtests/Android.mk          | 2 +-
 location/tests/locationtests/AndroidManifest.xml | 2 +-
 location/tests/locationtests/AndroidTest.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/location/tests/locationtests/Android.mk b/location/tests/locationtests/Android.mk
index b2fd8ecef7341..3dcf694263626 100644
--- a/location/tests/locationtests/Android.mk
+++ b/location/tests/locationtests/Android.mk
@@ -12,7 +12,7 @@ LOCAL_PACKAGE_NAME := FrameworksLocationTests
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-test \
+    androidx.test.rules \
     core-test-rules \
     guava \
     mockito-target-minus-junit4 \
diff --git a/location/tests/locationtests/AndroidManifest.xml b/location/tests/locationtests/AndroidManifest.xml
index ddb8ea6aa53a1..5010d3d56a502 100644
--- a/location/tests/locationtests/AndroidManifest.xml
+++ b/location/tests/locationtests/AndroidManifest.xml
@@ -29,7 +29,7 @@
     </application>
 
     <instrumentation
-        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.frameworks.locationtests"
         android:label="Frameworks Location Tests" />
 </manifest>
diff --git a/location/tests/locationtests/AndroidTest.xml b/location/tests/locationtests/AndroidTest.xml
index bb6547bec0f74..7bddb58f2cf28 100644
--- a/location/tests/locationtests/AndroidTest.xml
+++ b/location/tests/locationtests/AndroidTest.xml
@@ -22,7 +22,7 @@
     <option name="test-tag" value="FrameworksLocationTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.frameworks.locationtests" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
         <option name="hidden-api-checks" value="false"/>
     </test>
 </configuration>