| commit | 0cc499dbced50ce43341423509b9cb798a27acfc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 27 18:36:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 27 18:36:35 2023 +0000 |
| tree | ba8c16daed27dcd2ce65988d98cef0378f84fbf4 | |
| parent | 283d733d3e7b9a6cfe61555b2a3d1e25cd30765c [diff] | |
| parent | 92bbf50ef8f773e7d2226195a700e5f3595fd984 [diff] |
[automerger skipped] Merge "Revert "Remove uiautomator version 2.2.0-alpha4"" into android13-tests-dev am: e4f0829735 am: b71d567eef am: 92bbf50ef8 -s ours am skip reason: Merged-In Ia3bc93a71a3bd46669966637bc756edd1d5a19d7 with SHA-1 ad9fdc9de6 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2426053 Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2458108 Change-Id: Ibaa13abcd58e0178bffa0d9fe6038135abfc2fdb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/common/ub-uiautomator/Android.bp b/common/ub-uiautomator/Android.bp index b0095dc..629b842 100644 --- a/common/ub-uiautomator/Android.bp +++ b/common/ub-uiautomator/Android.bp
@@ -21,9 +21,3 @@ jars: ["ub-uiautomator.jar"], sdk_version: "18", } - -java_import { - name: "androidx.test.uiautomator_uiautomator", - jars: ["uiautomator-2.2.0-alpha4.jar"], - sdk_version: "18", -}
diff --git a/common/ub-uiautomator/PREBUILT b/common/ub-uiautomator/PREBUILT index a6b9fc7..7bc431d 100644 --- a/common/ub-uiautomator/PREBUILT +++ b/common/ub-uiautomator/PREBUILT
@@ -3,8 +3,3 @@ can be rebuilt from project platform/frameworks/uiautomator revision 4c4c25eb5e399e7e4e8532e2dedd48fa6efa17a6 - -uiautomator-2.2.0-alpha4.jar - is obtained from - downloading https://maven.google.com/androidx/test/uiautomator/uiautomator/2.2.0-alpha4/uiautomator-2.2.0-alpha4.aar - and extracting classes.jar
diff --git a/common/ub-uiautomator/uiautomator-2.2.0-alpha4.jar b/common/ub-uiautomator/uiautomator-2.2.0-alpha4.jar deleted file mode 100755 index b080e11..0000000 --- a/common/ub-uiautomator/uiautomator-2.2.0-alpha4.jar +++ /dev/null Binary files differ