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

Commit b6608344 authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

DO NOT MERGE Fix robotests for AOSP 

AOSP is still using snapshots w/ selective includes from the tree.
ApexInfo was missing from PackageInfo, hence the failures. Including it
in target and test.

Bug: 135192382
Test: m -j RunFrameworksServicesRoboTests
Change-Id: I83b0080db2bdc4c88eda6b5a027701973549a611
parent 09f66757

services/robotests/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -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 \

services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java

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