summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-07 00:25:13 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-07 00:25:13 +0000
commitc02da0d7eb6cc4e500edbe09b65547e5ffbebc59 (patch)
treec530acc726bff76e0c3c2fb1eb85afa9a1e03f53
parent451773612da4b34544dd5fef1e7c0603efa085cd (diff)
parentaaf27ddb2cef2fcb8c0853ae2c48945b4bc7b73b (diff)
downloadcts-android13-mainline-mediaprovider-release.tar.gz
Snap for 9698047 from aaf27ddb2cef2fcb8c0853ae2c48945b4bc7b73b to mainline-mediaprovider-releaseaml_mpr_331812020aml_mpr_331711020android13-mainline-mediaprovider-release
Change-Id: Ia30fbfc8a78ba068abed74dd7c5835a3eb3fa800
-rwxr-xr-xtools/cts-tradefed/etc/cts-tradefed3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/cts-tradefed/etc/cts-tradefed b/tools/cts-tradefed/etc/cts-tradefed
index 3d57a11d0f7..39292355dbc 100755
--- a/tools/cts-tradefed/etc/cts-tradefed
+++ b/tools/cts-tradefed/etc/cts-tradefed
@@ -99,6 +99,9 @@ JAR_DIR=${CTS_ROOT}/android-cts/tools
for JAR in ${JAR_DIR}/*.jar; do
JAR_PATH=${JAR_PATH}:${JAR}
done
+# Move 'tradefed.jar' to the front of the jar path
+TRADEFED_JAR=":${JAR_DIR}/tradefed.jar"
+JAR_PATH="${TRADEFED_JAR}${JAR_PATH/$TRADEFED_JAR}"
JAR_PATH=${JAR_PATH:1} # Strip off leading ':'
# load any shared libraries for host-side executables