| commit | 50d15f2b5205615e29fd2331879206a29706f673 | [log] [tgz] |
|---|---|---|
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Oct 13 14:53:22 2021 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Oct 13 14:53:22 2021 +0000 |
| tree | 0a8259b65e489937722dda097ae59ec89fe1ee82 | |
| parent | b054eee00e0b1eb7ef890e030b7d2275da7574a1 [diff] | |
| parent | cac2d25c2dca2afda600f345281f369e16dd93e1 [diff] |
Snap for 7819949 from cac2d25c2dca2afda600f345281f369e16dd93e1 to mainline-media-swcodec-release Change-Id: Ie304cfba3b9c225cc440bbfc91495cd627d4cc87
diff --git a/filegroups/tradefed/TradeFedTestApp.apk b/filegroups/tradefed/TradeFedTestApp.apk index ef8df6c..55338fc 100755 --- a/filegroups/tradefed/TradeFedTestApp.apk +++ b/filegroups/tradefed/TradeFedTestApp.apk Binary files differ
diff --git a/filegroups/tradefed/TradeFedUiTestApp.apk b/filegroups/tradefed/TradeFedUiTestApp.apk index 32ecd24..c2e8645 100755 --- a/filegroups/tradefed/TradeFedUiTestApp.apk +++ b/filegroups/tradefed/TradeFedUiTestApp.apk Binary files differ
diff --git a/filegroups/tradefed/tradefed-test-framework.jar b/filegroups/tradefed/tradefed-test-framework.jar index 9d35841..3b5d60a 100755 --- a/filegroups/tradefed/tradefed-test-framework.jar +++ b/filegroups/tradefed/tradefed-test-framework.jar Binary files differ
diff --git a/filegroups/tradefed/tradefed-tests.jar b/filegroups/tradefed/tradefed-tests.jar index d56ceda..a8c6604 100755 --- a/filegroups/tradefed/tradefed-tests.jar +++ b/filegroups/tradefed/tradefed-tests.jar Binary files differ
diff --git a/filegroups/tradefed/tradefed.jar b/filegroups/tradefed/tradefed.jar index e6357b2..11c3d2f 100755 --- a/filegroups/tradefed/tradefed.jar +++ b/filegroups/tradefed/tradefed.jar Binary files differ
diff --git a/filegroups/tradefed/tradefed.sh b/filegroups/tradefed/tradefed.sh index b1f9b0c..6847b7e 100755 --- a/filegroups/tradefed/tradefed.sh +++ b/filegroups/tradefed/tradefed.sh
@@ -25,10 +25,24 @@ # Allow to specify another java entry point CONSOLE_CLASS="com.android.tradefed.command.Console" -if [ ! -z "${ENTRY_CLASS}" ]; then +if [ -n "${ENTRY_CLASS}" ]; then CONSOLE_CLASS=${ENTRY_CLASS} fi +if [ -n "${LOCAL_AUTH}" ]; then + if [ -n "${LOCAL_CLIENT_FILE}" ]; then + echo "Using user provided LOCAL_CLIENT_FILE" + else + export LOCAL_CLIENT_FILE="${TF_JAR_DIR}"/client_id_file.json + fi + + ${TF_JAVA} -cp "${TF_PATH}" com.android.tradefed.command.LocalDeveloper + local_client=$? + if [ "${local_client}" -eq 0 ]; then + gcloud auth application-default login --scopes=https://www.googleapis.com/auth/androidbuild.internal --client-id-file "$LOCAL_CLIENT_FILE" + fi +fi + # Note: must leave $RDBG_FLAG and $TRADEFED_OPTS unquoted so that they go away # when unset exec ${TF_JAVA} $ADD_OPENS_FLAG $RDBG_FLAG -XX:+HeapDumpOnOutOfMemoryError \
diff --git a/filegroups/tradefed/version.txt b/filegroups/tradefed/version.txt index 640859b..2106591 100755 --- a/filegroups/tradefed/version.txt +++ b/filegroups/tradefed/version.txt
@@ -1 +1 @@ -7801799 +7815206