From e9eff7a4501ea535145aedf340201d2d841532b1 Mon Sep 17 00:00:00 2001
From: Brett Chabot <brettchabot@google.com>
Date: Tue, 5 Mar 2019 09:10:36 -0800
Subject: [PATCH] Migrate frameworks/opt/net/ethernet to androidx.test

See go/jetpack-test-android-migration

Test: compile
Change-Id: I20fc49dd2487af2245f060454e7f32f5e9145a9c
---
 tests/ethernet/Android.bp                                    | 2 +-
 tests/ethernet/AndroidManifest.xml                           | 2 +-
 .../com/android/server/ethernet/EthernetTrackerTest.java     | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/ethernet/Android.bp b/tests/ethernet/Android.bp
index 8c5df21dae..9c776e604f 100644
--- a/tests/ethernet/Android.bp
+++ b/tests/ethernet/Android.bp
@@ -27,7 +27,7 @@ android_test {
     ],
 
     static_libs: [
-        "android-support-test",
+        "androidx.test.rules",
         "ethernet-service",
     ],
 }
diff --git a/tests/ethernet/AndroidManifest.xml b/tests/ethernet/AndroidManifest.xml
index 1bc0775310..302bb6c9a1 100644
--- a/tests/ethernet/AndroidManifest.xml
+++ b/tests/ethernet/AndroidManifest.xml
@@ -22,7 +22,7 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.server.ethernet.tests"
         android:label="Ethernet Service Tests" />
 </manifest>
diff --git a/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
index a56c9fe9fa..fa945d6659 100644
--- a/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
+++ b/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
@@ -25,8 +25,9 @@ import android.net.IpConfiguration.ProxySettings;
 import android.net.LinkAddress;
 import android.net.NetworkCapabilities;
 import android.net.StaticIpConfiguration;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;