Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate multidex to androidx" into pi-dev am: b5837d14c2

Browse Source 
am: 0c92eea176

Change-Id: I70622bfc32b2ef3f8001840cd22e626e652ef146
This commit is contained in:
Alan Viverette
2018-03-13 02:42:56 +00:00
committed by android-build-merger
parent 9726591d6b 0c92eea176
commit 8310fd3941
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
package com.android.multidexlegacyandexception;
import android.support.multidex.MultiDexApplication;
import androidx.multidex.MultiDexApplication;
public class TestApplication extends MultiDexApplication {

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

@@ -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 {

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

@@ -16,7 +16,7 @@
package com.android.multidexlegacytestapp;
import android.support.multidex.MultiDexApplication;
import androidx.multidex.MultiDexApplication;
import java.lang.annotation.Annotation;

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

@@ -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 {

2
core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml
View File

@@ -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

2
core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java
View File

@@ -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;

2
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml
View File

@@ -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

2
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml
View File

@@ -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

2
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml
View File

@@ -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