diff options
| author | 2019-06-28 13:00:07 +0000 | |
|---|---|---|
| committer | 2019-06-28 13:00:07 +0000 | |
| commit | 51b6c7666014e37e459735ba4f65d4f923a5855d (patch) | |
| tree | 7e498d14c43564ea12e630a4899dab4e9679c8c2 | |
| parent | 19cb14b3be8524f6e25c3fd34a5e5b8683dc5e1a (diff) | |
| parent | b6608344d595099b220186e0a385f91d56504e3e (diff) | |
Merge "DO NOT MERGE Fix robotests for AOSP"
| -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 c01c12465940..753d8d40011a 100644 --- a/services/robotests/Android.mk +++ b/services/robotests/Android.mk @@ -64,12 +64,14 @@ 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 + ../../core/java/android/util/KeyValueSettingObserver.java \ + ../../../../system/apex/apexd/aidl/android/apex/ApexInfo.aidl 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 + ../../core/java/android/app/IBackupAgent.aidl \ + ../../../../system/apex/apexd/aidl/android/apex/ApexInfo.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 b1dad5a87957..c163d11764ff 100644 --- a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java +++ b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java @@ -19,7 +19,6 @@ 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; @@ -80,7 +79,6 @@ 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; @@ -106,7 +104,7 @@ import java.util.stream.Stream; sdk = 26, shadows = {ShadowBackupDataInput.class, ShadowBackupDataOutput.class, ShadowQueuedWork.class} ) -@SystemLoaderPackages({"com.android.server.backup", "android.app.backup"}) +@SystemLoaderPackages({"com.android.server.backup", "android.app.backup", "android.apex"}) @SystemLoaderClasses({IBackupTransport.class, IBackupAgent.class, PackageInfo.class}) @Presubmit public class PerformBackupTaskTest { |