| commit | e96bdd44530107b63e86f9b25b6fafa4d981da52 | [log] [tgz] |
|---|---|---|
| author | SzuWei Lin <szuweilin@google.com> | Thu Jan 06 13:48:34 2022 +0800 |
| committer | SzuWei Lin <szuweilin@google.com> | Thu Jan 06 13:48:34 2022 +0800 |
| tree | d310cfc9d27e103a67e46b53cf3810e09e4ea9e9 | |
| parent | fae1df49468c3352ebc46c16c168a76ef5c099e3 [diff] | |
| parent | 140521dc9a79980a177b4adff390885bc81d724a [diff] |
Merge branch android12-platform-release Change-Id: Ifd64000e2b8bb9969b8fb45e20e6c6fec050f5a3
diff --git a/filegroups/suite/compatibility-host-util.jar b/filegroups/suite/compatibility-host-util.jar index 01f60f8..2c7162d 100755 --- a/filegroups/suite/compatibility-host-util.jar +++ b/filegroups/suite/compatibility-host-util.jar Binary files differ
diff --git a/filegroups/suite/compatibility-tradefed.jar b/filegroups/suite/compatibility-tradefed.jar index 909b965..1e21e14 100755 --- a/filegroups/suite/compatibility-tradefed.jar +++ b/filegroups/suite/compatibility-tradefed.jar Binary files differ
diff --git a/filegroups/tradefed/TradeFedTestApp.apk b/filegroups/tradefed/TradeFedTestApp.apk index 85c8039..ef8df6c 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 97ac705..32ecd24 100755 --- a/filegroups/tradefed/TradeFedUiTestApp.apk +++ b/filegroups/tradefed/TradeFedUiTestApp.apk Binary files differ
diff --git a/filegroups/tradefed/script_help.sh b/filegroups/tradefed/script_help.sh index 01f100d..f33b239 100755 --- a/filegroups/tradefed/script_help.sh +++ b/filegroups/tradefed/script_help.sh
@@ -96,7 +96,10 @@ for folder in ${ANDROID_HOST_OUT_TESTCASES}/*; do for entry in "$folder"/*; do if [[ "$entry" = *".jar"* ]]; then - TF_PATH=${TF_PATH}:$entry + # Exclude any jar that looks like robolectric + if ! grep -q android/app/Application.class "$entry"; then + TF_PATH=${TF_PATH}:$entry + fi fi done done
diff --git a/filegroups/tradefed/tradefed-contrib.jar b/filegroups/tradefed/tradefed-contrib.jar index 0e6da68..ed51841 100755 --- a/filegroups/tradefed/tradefed-contrib.jar +++ b/filegroups/tradefed/tradefed-contrib.jar Binary files differ
diff --git a/filegroups/tradefed/tradefed-test-framework.jar b/filegroups/tradefed/tradefed-test-framework.jar index d0d31e6..9d35841 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 24eadb2..d56ceda 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 9fe47a8..e6357b2 100755 --- a/filegroups/tradefed/tradefed.jar +++ b/filegroups/tradefed/tradefed.jar Binary files differ
diff --git a/filegroups/tradefed/version.txt b/filegroups/tradefed/version.txt index 4ba45dc..640859b 100755 --- a/filegroups/tradefed/version.txt +++ b/filegroups/tradefed/version.txt
@@ -1 +1 @@ -7638253 +7801799