diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-05 02:09:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-05 02:09:23 +0000 |
| commit | 39e90b135f86ce65eaa9b4483c3b35b4dcd333a7 (patch) | |
| tree | c552fadf56466b2e0e786dd0e667b6db64beb244 | |
| parent | 07bead9c5788fa534bd884c0256fe8b1733de2ca (diff) | |
| parent | a36b77a1e81e4cfe8e58b389dd11e73e971c6fbf (diff) | |
| download | catbox-android12-qpr3-s6-release.tar.gz | |
Snap for 8254921 from a36b77a1e81e4cfe8e58b389dd11e73e971c6fbf to sc-qpr3-releaseandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
Change-Id: I4a8812257bded1537fb4dee6d4ef179fc02bcbfb
| -rw-r--r-- | tools/catbox-common/res/config/catbox-performance-base.xml | 1 | ||||
| -rw-r--r-- | tools/catbox-common/res/config/catbox-preparer.xml | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tools/catbox-common/res/config/catbox-performance-base.xml b/tools/catbox-common/res/config/catbox-performance-base.xml index 17bd214..6109552 100644 --- a/tools/catbox-common/res/config/catbox-performance-base.xml +++ b/tools/catbox-common/res/config/catbox-performance-base.xml @@ -31,7 +31,6 @@ <option name="test-tag-suffix" value="performance" /> <!-- Performance Specific Target Preparers --> - <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" /> <target_preparer class="com.android.tradefed.targetprep.PerfettoPreparer" /> <target_preparer class="com.android.tradefed.targetprep.TimeWaster" /> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ReportLogCollector"> diff --git a/tools/catbox-common/res/config/catbox-preparer.xml b/tools/catbox-common/res/config/catbox-preparer.xml index d7667ed..db9aaf7 100644 --- a/tools/catbox-common/res/config/catbox-preparer.xml +++ b/tools/catbox-common/res/config/catbox-preparer.xml @@ -14,14 +14,6 @@ limitations under the License. --> <configuration description="CATBOX Target Preparer Configuration"> - <!-- Target Preparers - Add System User and Disable By Default --> - <target_preparer class="com.android.tradefed.targetprep.RunOnSystemUserTargetPreparer"> - <option name="disable" value="true" /> - </target_preparer> - - <!-- Target Preparers - Disable SELinux before Test Execution --> - <target_preparer class="com.android.tradefed.targetprep.DisableSELinuxTargetPreparer" /> - <!-- Target Preparers - Clean the Device after Test Execution --> <target_preparer class="com.android.tradefed.targetprep.DeviceCleaner"> <option name="disable" value="true" /> @@ -42,6 +34,17 @@ <option name="set-secure-setting" key="location_mode" value="1" /> </target_preparer> + <!-- Target Preparers - ADB Root --> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + + <!-- Target Preparers - Add System User and Disable By Default --> + <target_preparer class="com.android.tradefed.targetprep.RunOnSystemUserTargetPreparer"> + <option name="disable" value="true" /> + </target_preparer> + + <!-- Target Preparers - Disable SELinux before Test Execution --> + <target_preparer class="com.android.tradefed.targetprep.DisableSELinuxTargetPreparer" /> + <!-- Target Preparers - Install Apps --> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" > <option name="cleanup-apks" value="true" /> |