Convert to androidx.test from android-support-test.
android-support-test has long been deprecated and unsupported,
and it causes problems having both androidx.test and
androiud.support.test included in one binary.
Bug: 172570181
Test: m -j NullHomeTest mediatunertest mediatranscodingtest mediaroutertest mediaframeworktest BluetoothMidiTests
Change-Id: If86f5634beab88db07656f743b19beddd9d77984
diff --git a/tests/GamePerformance/Android.bp b/tests/GamePerformance/Android.bp
index 648fd81..02908d3 100644
--- a/tests/GamePerformance/Android.bp
+++ b/tests/GamePerformance/Android.bp
@@ -22,7 +22,7 @@
enabled: false,
},
srcs: ["src/**/*.java"],
- static_libs: ["android-support-test"],
+ static_libs: ["androidx.test.rules"],
libs: [
"android.test.base",
"android.test.runner",
diff --git a/tests/NullHomeTest/Android.bp b/tests/NullHomeTest/Android.bp
index 99248bf..fc71d0d 100644
--- a/tests/NullHomeTest/Android.bp
+++ b/tests/NullHomeTest/Android.bp
@@ -17,6 +17,6 @@
srcs: ["src/**/*.java"],
certificate: "platform",
platform_apis: true,
- static_libs: ["android-support-test"],
+ static_libs: ["androidx.test.rules"],
test_suites: ["device-tests"],
}
diff --git a/tests/NullHomeTest/AndroidManifest.xml b/tests/NullHomeTest/AndroidManifest.xml
index dc6402e..6f77781 100644
--- a/tests/NullHomeTest/AndroidManifest.xml
+++ b/tests/NullHomeTest/AndroidManifest.xml
@@ -21,7 +21,7 @@
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.test.nullhome"
android:label="Check if no null Home exists/is enabled" />
diff --git a/tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java b/tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java
index 1d77cdc5..3ec3ef2 100644
--- a/tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java
+++ b/tests/NullHomeTest/src/com/android/test/nullhome/NullHomeTest.java
@@ -18,9 +18,10 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;