diff options
| -rw-r--r-- | services/robotests/Android.mk | 6 | ||||
| -rw-r--r-- | services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk index 753d8d40011a..c01c12465940 100644 --- a/services/robotests/Android.mk +++ b/services/robotests/Android.mk @@ -64,14 +64,12 @@ LOCAL_SRC_FILES := \ $(call all-Iaidl-files-under, ../../core/java/android/app/backup) \ ../../core/java/android/content/pm/PackageInfo.java \ ../../core/java/android/app/IBackupAgent.aidl \ - ../../core/java/android/util/KeyValueSettingObserver.java \ - ../../../../system/apex/apexd/aidl/android/apex/ApexInfo.aidl + ../../core/java/android/util/KeyValueSettingObserver.java LOCAL_AIDL_INCLUDES := \ $(call all-Iaidl-files-under, $(INTERNAL_BACKUP)) \ $(call all-Iaidl-files-under, ../../core/java/android/app/backup) \ - ../../core/java/android/app/IBackupAgent.aidl \ - ../../../../system/apex/apexd/aidl/android/apex/ApexInfo.aidl + ../../core/java/android/app/IBackupAgent.aidl LOCAL_STATIC_JAVA_LIBRARIES := \ platform-robolectric-android-all-stubs \ diff --git a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java index c163d11764ff..b1dad5a87957 100644 --- a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java +++ b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java @@ -19,6 +19,7 @@ package com.android.server.backup; import static com.android.server.backup.testing.BackupManagerServiceTestUtils.createBackupWakeLock; import static com.android.server.backup.testing.BackupManagerServiceTestUtils.setUpBackupManagerServiceBasics; import static com.android.server.backup.testing.BackupManagerServiceTestUtils.startBackupThreadAndGetLooper; + import static com.android.server.backup.testing.TransportData.backupTransport; import static com.google.common.truth.Truth.assertThat; @@ -79,6 +80,7 @@ import com.android.server.testing.shadows.ShadowBackupDataInput; import com.android.server.testing.shadows.ShadowBackupDataOutput; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; @@ -104,7 +106,7 @@ import java.util.stream.Stream; sdk = 26, shadows = {ShadowBackupDataInput.class, ShadowBackupDataOutput.class, ShadowQueuedWork.class} ) -@SystemLoaderPackages({"com.android.server.backup", "android.app.backup", "android.apex"}) +@SystemLoaderPackages({"com.android.server.backup", "android.app.backup"}) @SystemLoaderClasses({IBackupTransport.class, IBackupAgent.class, PackageInfo.class}) @Presubmit public class PerformBackupTaskTest { |