Fix breakage for the CL in AOSP aosp/929074
Test: mmma platform_testing/tests/jank/androidtvjanktests
Change-Id: I94249924c2da9e74de77108c267066a170c96075
diff --git a/tests/jank/androidtvjanktests/Android.bp b/tests/jank/androidtvjanktests/Android.bp
index 78f9018..0c74b4a 100644
--- a/tests/jank/androidtvjanktests/Android.bp
+++ b/tests/jank/androidtvjanktests/Android.bp
@@ -17,7 +17,7 @@
srcs: ["src/**/*.java"],
static_libs: [
- "ub-janktesthelper",
+ "androidx.test.janktesthelper",
"ub-uiautomator",
"timeresult-helper-lib",
"dpad-util",
diff --git a/tests/jank/androidtvjanktests/AndroidManifest.xml b/tests/jank/androidtvjanktests/AndroidManifest.xml
index bdd3039..50987ca 100644
--- a/tests/jank/androidtvjanktests/AndroidManifest.xml
+++ b/tests/jank/androidtvjanktests/AndroidManifest.xml
@@ -21,11 +21,11 @@
<uses-library android:name="android.test.runner" />
</application>
- <uses-sdk android:minSdkVersion="19"
+ <uses-sdk android:minSdkVersion="23"
android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<instrumentation
- android:name="android.test.InstrumentationTestRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.androidtv.janktests"
android:label="Platform Android TV Jank Tests" />
</manifest>
diff --git a/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemAppJankTests.java b/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemAppJankTests.java
index f6747d0..f2a54e3 100644
--- a/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemAppJankTests.java
+++ b/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemAppJankTests.java
@@ -20,9 +20,9 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.jank.GfxMonitor;
-import android.support.test.jank.JankTest;
-import android.support.test.jank.JankTestBase;
+import androidx.test.jank.GfxMonitor;
+import androidx.test.jank.JankTest;
+import androidx.test.jank.JankTestBase;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject2;
@@ -114,4 +114,4 @@
getInstrumentation().getContext().startActivity(appIntent);
SystemClock.sleep(LONG_TIMEOUT);
}
-}
\ No newline at end of file
+}
diff --git a/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemUiJankTests.java b/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemUiJankTests.java
index 6868b76..489fc12 100644
--- a/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemUiJankTests.java
+++ b/tests/jank/androidtvjanktests/src/com/android/androidtv/janktests/SystemUiJankTests.java
@@ -18,9 +18,9 @@
import android.os.Bundle;
import android.platform.test.utils.DPadUtil;
-import android.support.test.jank.GfxMonitor;
-import android.support.test.jank.JankTest;
-import android.support.test.jank.JankTestBase;
+import androidx.test.jank.GfxMonitor;
+import androidx.test.jank.JankTest;
+import androidx.test.jank.JankTestBase;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.BySelector;
import android.support.test.uiautomator.Direction;
