Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c92eea1 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Migrate multidex to androidx" into pi-dev 

am: b5837d14

Change-Id: I9d1193b1387c6160daa57fd1f4c2812b3bf63824
parents d877fdb2 b5837d14

core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/TestApplication.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.multidexlegacyandexception;



import android.support.multidex.MultiDexApplication;

import androidx.multidex.MultiDexApplication;



public class TestApplication extends MultiDexApplication {

core/tests/hosttests/test-apps/MultiDexLegacyAndException/src/com/android/multidexlegacyandexception/tests/MultiDexAndroidJUnitRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/src/com/android/multidexlegacytestapp/TestApplication.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.multidexlegacytestapp;



import android.support.multidex.MultiDexApplication;

import androidx.multidex.MultiDexApplication;



import java.lang.annotation.Annotation;

core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/src/com/android/multidexlegacytestapp/test2/MultiDexAndroidJUnitRunner.java

+1 −1
Original line number Diff line number Diff line 
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 {

core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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