commit c8ce9e6b1b5393bb4df388e346c2deefa802c2b7
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 15 00:12:23 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 15 00:12:23 2019 +0000
tree 0254a65a017f02f2726a052faa5db24d434b8fb3
parent 00d9070421df1f06fd38532706dc41c405bec3b4
parent 3732ffd9d3b3e0c5d807bb215208b3e1f6b7d1e3

Merge "Migrate cts/tests/tests/jni_vendor to androidx.test"

tests/tests/jni_vendor/Android.mk

diff --git a/tests/tests/jni_vendor/Android.mk b/tests/tests/jni_vendor/Android.mk
index ba06b42..6b9bfb3 100644
--- a/tests/tests/jni_vendor/Android.mk
+++ b/tests/tests/jni_vendor/Android.mk
@@ -27,7 +27,7 @@
 # When built, explicitly put it in the vendor partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules ctstestrunner-axt
 
 LOCAL_JNI_SHARED_LIBRARIES := libvendorjnitest
 

tests/tests/jni_vendor/AndroidManifest.xml

diff --git a/tests/tests/jni_vendor/AndroidManifest.xml b/tests/tests/jni_vendor/AndroidManifest.xml
index 363a151..96a1c9e 100644
--- a/tests/tests/jni_vendor/AndroidManifest.xml
+++ b/tests/tests/jni_vendor/AndroidManifest.xml
@@ -23,7 +23,7 @@
     </application>
 
     <!-- This is a self-instrumenting test package. -->
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                      android:targetPackage="android.jni.vendor.cts"
                      android:label="CTS tests of calling native code via Vendor's JNI">
         <meta-data android:name="listener"