diff options
| author | Sanket Chinchalkar <schinchalkar@google.com> | 2021-06-29 21:35:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-29 21:35:59 +0000 |
| commit | 72824b818530270143376308afdcb8d030e7fac3 (patch) | |
| tree | cacec3cdf4d4c138a2c1105f04fa73972162d679 | |
| parent | a742a4a591c3dd21bb449c4d74063865e8267cfd (diff) | |
| parent | fb3064e42b7aa0cae363758e7cb67cee278ceed2 (diff) | |
| download | catbox-android12-mainline-conscrypt-release.tar.gz | |
Enable collecting device build info in CATBox am: fb3064e42bandroid-mainline-12.0.0_r8android-mainline-12.0.0_r6android-mainline-12.0.0_r25android-mainline-12.0.0_r23android12-mainline-conscrypt-releaseandroid12-mainline-captiveportallogin-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/catbox/+/15001697
Change-Id: I7d1b365264717dec4f93012828ea1d015f6c4d4a
| -rw-r--r-- | OWNERS | 6 | ||||
| -rw-r--r-- | tools/catbox-tradefed/etc/catbox-tradefed | 1 | ||||
| -rw-r--r-- | tools/catbox-tradefed/res/config/catbox-common.xml | 10 |
3 files changed, 17 insertions, 0 deletions
@@ -0,0 +1,6 @@ +# Bug component: 945967 +# OWNERS of CATBox Repo +schinchalkar@google.com +smara@google.com +tongfei@google.com +zhaomingyin@google.com
\ No newline at end of file diff --git a/tools/catbox-tradefed/etc/catbox-tradefed b/tools/catbox-tradefed/etc/catbox-tradefed index abc5fbd..6b41152 100644 --- a/tools/catbox-tradefed/etc/catbox-tradefed +++ b/tools/catbox-tradefed/etc/catbox-tradefed @@ -73,6 +73,7 @@ fi; JAR_DIR=${CATBOX_ROOT}/android-catbox/tools JARS="tradefed + loganalysis compatibility-host-util catbox-tradefed catbox-tradefed-tests" diff --git a/tools/catbox-tradefed/res/config/catbox-common.xml b/tools/catbox-tradefed/res/config/catbox-common.xml index 462f4ef..51a9cee 100644 --- a/tools/catbox-tradefed/res/config/catbox-common.xml +++ b/tools/catbox-tradefed/res/config/catbox-common.xml @@ -19,6 +19,16 @@ <!-- Test Tag --> <option name="test-tag" value="catbox" /> + <!-- Target Preparer To Collect Device Info --> + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceInfoCollector"> + <option name="apk" value="CtsDeviceInfo.apk"/> + <option name="package" value="com.android.compatibility.common.deviceinfo"/> + <option name="src-dir" value="/sdcard/device-info-files/"/> + <option name="dest-dir" value="device-info-files/"/> + <option name="temp-dir" value="temp-device-info-files/"/> + <option name="throw-error" value="false"/> + </target_preparer> + <!-- Basic Reporters --> <include name="basic-reporters" /> |