Added new android.test.base targets
Renames ...-legacy-test-... targets related to stubs generation to
...-android-test-base-....
(cherry picked from commit 5c99382a1995723637814221cd5432c458c622ad)
Bug: 30188076
Test: make checkbuild
Change-Id: I40b39c5250b7d990a903052c0b1ebd694242b5b3
Merged-Id: I54204733612d6d3f14dd8023973e993a5ddab51d
diff --git a/test-base/Android.bp b/test-base/Android.bp
index 1173bc6..30c9af1 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -14,6 +14,24 @@
// limitations under the License.
//
+// Build the android.test.base library
+// ===================================
+// This contains the junit.framework and android.test classes that were in
+// Android API level 25 excluding those from android.test.runner.
+// Also contains the com.android.internal.util.Predicate[s] classes.
+java_library {
+ name: "android.test.base",
+
+ srcs: ["src/**/*.java"],
+
+ no_framework_libs: true,
+ hostdex: true,
+ libs: [
+ "framework",
+ ],
+
+}
+
// Build the legacy-test library
// =============================
// This contains the junit.framework and android.test classes that were in
@@ -21,23 +39,26 @@
// Also contains the com.android.internal.util.Predicate[s] classes.
java_library {
name: "legacy-test",
-
- srcs: ["src/**/*.java"],
+ static_libs: ["android.test.base"],
no_framework_libs: true,
libs: [
"framework",
],
-
}
-// Build the repackaged-legacy-test library
-// ========================================
+// Build the repackaged.android.test.base library
+// ==============================================
// This contains repackaged versions of the classes from legacy-test.
java_library_static {
- name: "repackaged-legacy-test",
+ name: "repackaged.android.test.base",
- static_libs: ["legacy-test"],
+ static_libs: ["android.test.base"],
+
+ no_framework_libs: true,
+ libs: [
+ "framework",
+ ],
jarjar_rules: "jarjar-rules.txt",
}
