diff options
9 files changed, 9 insertions, 9 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/TestApplication.java b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/TestApplication.java index dece9a45cfd6..bcf94909cefa 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/TestApplication.java +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/TestApplication.java @@ -16,7 +16,7 @@ package com.android.multidexlegacyandexception; -import android.support.multidex.MultiDexApplication; +import androidx.multidex.MultiDexApplication; public class TestApplication extends MultiDexApplication { diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/tests/MultiDexAndroidJUnitRunner.java b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/tests/MultiDexAndroidJUnitRunner.java index 758ac1dcb4a0..92a3b0c0f7c3 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/tests/MultiDexAndroidJUnitRunner.java +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/tests/MultiDexAndroidJUnitRunner.java @@ -17,7 +17,7 @@ package com.android.multidexlegacyandexception.tests; import android.os.Bundle; -import android.support.multidex.MultiDex; +import androidx.multidex.MultiDex; import android.support.test.runner.AndroidJUnitRunner; public class MultiDexAndroidJUnitRunner extends AndroidJUnitRunner { diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/src/com/android/multidexlegacytestapp/TestApplication.java b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/src/com/android/multidexlegacytestapp/TestApplication.java index c52ad292b6de..f89d13259618 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/src/com/android/multidexlegacytestapp/TestApplication.java +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/src/com/android/multidexlegacytestapp/TestApplication.java @@ -16,7 +16,7 @@ package com.android.multidexlegacytestapp; -import android.support.multidex.MultiDexApplication; +import androidx.multidex.MultiDexApplication; import java.lang.annotation.Annotation; diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/MultiDexAndroidJUnitRunner.java b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/MultiDexAndroidJUnitRunner.java index 963f90432dd7..9e41a925de89 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/MultiDexAndroidJUnitRunner.java +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/MultiDexAndroidJUnitRunner.java @@ -1,7 +1,7 @@ package com.android.multidexlegacytestapp.test2; import android.os.Bundle; -import android.support.multidex.MultiDex; +import androidx.multidex.MultiDex; import android.support.test.runner.AndroidJUnitRunner; public class MultiDexAndroidJUnitRunner extends AndroidJUnitRunner { diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml index 7993c6f48f83..5f006fe59a63 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml @@ -9,7 +9,7 @@ android:targetSdkVersion="18" /> <application - android:name="android.support.multidex.MultiDexApplication" + android:name="androidx.multidex.MultiDexApplication" android:allowBackup="true" android:label="MultiDexLegacyTestApp_corrupted"> <activity diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java index cb0a591559db..bbb494425901 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java @@ -20,7 +20,7 @@ import android.app.Service; import android.content.Context; import android.content.Intent; import android.os.IBinder; -import android.support.multidex.MultiDex; +import androidx.multidex.MultiDex; import android.util.Log; import java.io.File; diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml index c7b066d15b8a..f3f11b99e19d 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml @@ -9,7 +9,7 @@ android:targetSdkVersion="18" /> <application - android:name="android.support.multidex.MultiDexApplication" + android:name="androidx.multidex.MultiDexApplication" android:allowBackup="true" android:label="MultiDexLegacyVersionedTestApp_v1"> <activity diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml index 4d247931f547..e43e56b24654 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml @@ -9,7 +9,7 @@ android:targetSdkVersion="18" /> <application - android:name="android.support.multidex.MultiDexApplication" + android:name="androidx.multidex.MultiDexApplication" android:allowBackup="true" android:label="MultiDexLegacyVersionedTestApp_v2"> <activity diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml index 76c92dd05ca5..1d9722887998 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml @@ -9,7 +9,7 @@ android:targetSdkVersion="18" /> <application - android:name="android.support.multidex.MultiDexApplication" + android:name="androidx.multidex.MultiDexApplication" android:allowBackup="true" android:label="MultiDexLegacyVersionedTestApp_v3"> <activity |