Merge "Sync tools-common-prebuilt.jar from git_master." am: 5b8e2b25a6 am: 64dded1a72
am: 007e2c00c2
Change-Id: I3cef98f345691ba72d3fdc169d9c819d6eaa4d7a
diff --git a/common/android-support-test/Android.bp b/common/android-support-test/Android.bp
index 8f0c4d9..569f7e6 100644
--- a/common/android-support-test/Android.bp
+++ b/common/android-support-test/Android.bp
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// DEPRECATED! Use androidx-test libraries instead
+
// for Android JUnit runner, monitor and rules
java_library_static {
name: "android-support-test",
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index d7b43ab..756448e 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -1,5 +1,5 @@
// Automatically generated with:
-// pom2bp -rewrite 'androidx.test.janktesthelper:janktesthelper=androidx.test.janktesthelper' -rewrite 'androidx.test.uiautomator:uiautomator=androidx.test.uiautomator' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'com.google.truth:truth=truth-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite 'javax.inject:javax.inject=jsr330' -rewrite 'com.google.android.material:material=com.google.android.material_material' -rewrite 'androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout' -rewrite 'androidx.viewpager:viewpager=androidx.viewpager_viewpager' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils' -sdk-version current .
+// pom2bp -rewrite 'androidx.test.uiautomator:uiautomator=androidx.test.uiautomator' -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test.janktesthelper:janktesthelper=androidx.test.janktesthelper' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'com.google.truth:truth=truth-prebuilt' -rewrite 'net.sf.kxml:kxml2=kxml2-android' -rewrite 'androidx.lifecycle:lifecycle-common=androidx.lifecycle_lifecycle-common' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'org.hamcrest:hamcrest-integration=hamcrest' -rewrite 'javax.inject:javax.inject=jsr330' -rewrite 'com.google.android.material:material=com.google.android.material_material' -rewrite 'androidx.drawerlayout:drawerlayout=androidx.drawerlayout_drawerlayout' -rewrite 'androidx.viewpager:viewpager=androidx.viewpager_viewpager' -rewrite 'androidx.recyclerview:recyclerview=androidx.recyclerview_recyclerview' -rewrite 'androidx.core:core=androidx.core_core' -rewrite 'androidx.legacy:legacy-support-core-utils=androidx.legacy_legacy-support-core-utils' -sdk-version current .
android_library_import {
name: "androidx.test.core-nodeps",
diff --git a/common/kxml2/Android.bp b/common/kxml2/Android.bp
index dd8b3b5..ee347b2 100644
--- a/common/kxml2/Android.bp
+++ b/common/kxml2/Android.bp
@@ -22,4 +22,3 @@
name: "kxml2-android",
jars: ["kxml2-2.3.0.jar"],
}
-
diff --git a/common/layoutlib_api/PREBUILT b/common/layoutlib_api/PREBUILT
index 2d152c1..c67b920 100644
--- a/common/layoutlib_api/PREBUILT
+++ b/common/layoutlib_api/PREBUILT
@@ -1 +1 @@
-layoutlib_api-prebuilt.jar was built from tools/base/layoutlib-api@b93a34b533e050829287a5ca62d9f9cb98cdd94b
+layoutlib_api-prebuilt.jar was built from tools/base/layoutlib-api@e1d267e226d7c69cebe8f53a4df519ab658a1a67
diff --git a/common/layoutlib_api/layoutlib_api-prebuilt.jar b/common/layoutlib_api/layoutlib_api-prebuilt.jar
index 18a9e9f..bfcc330 100644
--- a/common/layoutlib_api/layoutlib_api-prebuilt.jar
+++ b/common/layoutlib_api/layoutlib_api-prebuilt.jar
Binary files differ
diff --git a/common/layoutlib_api/layoutlib_api-sources.jar b/common/layoutlib_api/layoutlib_api-sources.jar
index 08600dc..34799cd 100644
--- a/common/layoutlib_api/layoutlib_api-sources.jar
+++ b/common/layoutlib_api/layoutlib_api-sources.jar
Binary files differ
diff --git a/common/robolectric/android-all/android-all-8.1.0-robolectric-4611349.jar b/common/robolectric/android-all/android-all-8.1.0-robolectric-4611349.jar
new file mode 100644
index 0000000..278d588
--- /dev/null
+++ b/common/robolectric/android-all/android-all-8.1.0-robolectric-4611349.jar
Binary files differ
diff --git a/common/robolectric/android-all/android-all-9-robolectric-4913185-2.jar b/common/robolectric/android-all/android-all-9-robolectric-4913185-2.jar
new file mode 100644
index 0000000..585dbbc
--- /dev/null
+++ b/common/robolectric/android-all/android-all-9-robolectric-4913185-2.jar
Binary files differ
diff --git a/common/sdk-common/PREBUILT b/common/sdk-common/PREBUILT
index 769e910..38bc113 100644
--- a/common/sdk-common/PREBUILT
+++ b/common/sdk-common/PREBUILT
@@ -1 +1 @@
-sdk-common.jar was built from tools/base/sdk-common@b93a34b533e050829287a5ca62d9f9cb98cdd94b
+sdk-common.jar was built from tools/base/sdk-common@e1d267e226d7c69cebe8f53a4df519ab658a1a67
diff --git a/common/sdk-common/sdk-common-sources.jar b/common/sdk-common/sdk-common-sources.jar
index ce7b7ad..73e692b 100644
--- a/common/sdk-common/sdk-common-sources.jar
+++ b/common/sdk-common/sdk-common-sources.jar
Binary files differ
diff --git a/common/sdk-common/sdk-common.jar b/common/sdk-common/sdk-common.jar
index 54a951a..0c2b9e8 100644
--- a/common/sdk-common/sdk-common.jar
+++ b/common/sdk-common/sdk-common.jar
Binary files differ
diff --git a/common/ub-uiautomator/Android.bp b/common/ub-uiautomator/Android.bp
index d85d5b1..990e622 100644
--- a/common/ub-uiautomator/Android.bp
+++ b/common/ub-uiautomator/Android.bp
@@ -17,3 +17,9 @@
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 0c6fabe..4a18473 100644
--- a/common/ub-uiautomator/PREBUILT
+++ b/common/ub-uiautomator/PREBUILT
@@ -1,6 +1,10 @@
-The object in this prebuilt directory can be rebuilt from
- platform/frameworks/uiautomator
+ub-uiautomator.jar
+ is obtained from ub-support-test@4720804
+ can be rebuilt from
+ project platform/frameworks/uiautomator
+ revision 1e122aeaafd6421b8f9aa4b378fb728e887552d4
-From the revision 90e165837826dc5847821ddd8914202f5c7fb087
-
-Prebuilt jar obtained from ub-support-test@4636554
+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/ub-uiautomator.jar b/common/ub-uiautomator/ub-uiautomator.jar
index 51a0da0..a826b1f 100644
--- a/common/ub-uiautomator/ub-uiautomator.jar
+++ b/common/ub-uiautomator/ub-uiautomator.jar
Binary files differ
diff --git a/common/ub-uiautomator/uiautomator-2.2.0-alpha4.jar b/common/ub-uiautomator/uiautomator-2.2.0-alpha4.jar
new file mode 100755
index 0000000..b080e11
--- /dev/null
+++ b/common/ub-uiautomator/uiautomator-2.2.0-alpha4.jar
Binary files differ
