Use android.test.base.stubs instead of android.test.base
android.test.base may not exist on unbundled branches, use
android.test.base.stubs instead.
Bug: 73711752
Bug: 130287656
Test: TH
(cherry picked from commit 7437722423131615339ae274e5c0ec87cacda46b)
Change-Id: I10bab5ebde50c0e5967c9fa8a85da937f01680e7
Merged-In: Ic52b071fec6ca718c50158a59a4db74e1a7a9045
diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index 40fc319..243084c 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -1,5 +1,5 @@
// Automatically generated with:
-// pom2bp -rewrite 'androidx.test:=androidx.test.' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test.janktesthelper:janktesthelper=androidx.test.janktesthelper' -rewrite 'androidx.test.uiautomator:uiautomator=androidx.test.uiautomator' -extra-libs androidx.test.rules=android.test.base -extra-libs androidx.test.uiautomator=android.test.base -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:=androidx.test.' -rewrite 'androidx.test.ext:=androidx.test.ext.' -rewrite 'androidx.test.espresso:espresso-=androidx.test.espresso.' -rewrite 'androidx.test.janktesthelper:janktesthelper=androidx.test.janktesthelper' -rewrite 'androidx.test.uiautomator:uiautomator=androidx.test.uiautomator' -extra-libs androidx.test.rules=android.test.base.stubs -extra-libs androidx.test.uiautomator=android.test.base.stubs -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",
@@ -282,7 +282,7 @@
"androidx.test.runner",
],
libs: [
- "android.test.base",
+ "android.test.base.stubs",
],
}
@@ -296,7 +296,7 @@
"androidx.test.runner",
],
libs: [
- "android.test.base",
+ "android.test.base.stubs",
],
java_version: "1.7",
}
@@ -337,7 +337,7 @@
static_libs: [
],
libs: [
- "android.test.base",
+ "android.test.base.stubs",
],
}
@@ -350,7 +350,7 @@
"androidx.test.uiautomator-nodeps",
],
libs: [
- "android.test.base",
+ "android.test.base.stubs",
],
java_version: "1.7",
}
diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 95e1128..c35569e 100755
--- a/common/androidx-test/update-from-gmaven.py
+++ b/common/androidx-test/update-from-gmaven.py
@@ -36,8 +36,8 @@
}
extraLibs = {
- "androidx.test.rules" : "android.test.base",
- "androidx.test.uiautomator" : "android.test.base",
+ "androidx.test.rules" : "android.test.base.stubs",
+ "androidx.test.uiautomator" : "android.test.base.stubs",
}
def cmd(args):