diff options
| author | Hal Canary <halcanary@google.com> | 2019-03-04 08:05:51 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-04 08:05:51 -0800 |
| commit | 760a01b177b709e8695c59e77b16763c5c0da68c (patch) | |
| tree | 82e51198576c57ad223967948a3c2dd621c9ff6f | |
| parent | dce1e61031f22256a229a65172029190f57f24cc (diff) | |
| parent | d0c4efc114af821c346dbd33459d8937e2349feb (diff) | |
| download | skqp-760a01b177b709e8695c59e77b16763c5c0da68c.tar.gz | |
Merge "SkQP: android.support.test -> androidx.test"
am: d0c4efc114
Change-Id: Ifaf31656b3123b7adee86122b35b5e2fc141948e
4 files changed, 5 insertions, 5 deletions
diff --git a/platform_tools/android/apps/skqp/build.gradle b/platform_tools/android/apps/skqp/build.gradle index 8d0d95664d..e821ec9e73 100644 --- a/platform_tools/android/apps/skqp/build.gradle +++ b/platform_tools/android/apps/skqp/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.android.support:design:26.+' - implementation 'com.android.support.test:runner:0.5' + compile 'com.android.support:design:26.+' + compile 'androidx.test:runner:1.1.0' } android { diff --git a/platform_tools/android/apps/skqp/src/main/Android.mk b/platform_tools/android/apps/skqp/src/main/Android.mk index 85e75d651e..cdfdcd1995 100644 --- a/platform_tools/android/apps/skqp/src/main/Android.mk +++ b/platform_tools/android/apps/skqp/src/main/Android.mk @@ -37,7 +37,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-design LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner + ctstestrunner-axt LOCAL_SRC_FILES := $(call all-java-files-under, java) diff --git a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml index 0459522ad3..f97863547e 100644 --- a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml +++ b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml @@ -29,6 +29,6 @@ </activity> <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="org.skia.skqp"></instrumentation> </manifest> diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java index 7827f3e88c..8e360c8840 100644 --- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java +++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java @@ -10,8 +10,8 @@ package org.skia.skqp; import android.content.Context; import android.content.res.AssetManager; import android.content.res.Resources; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; |