diff options
| author | Jakub Gielzak <jgielzak@google.com> | 2019-02-18 10:51:09 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-18 10:51:09 -0800 |
| commit | e00505b90a34ddecb6a89ccf108f73157da9735a (patch) | |
| tree | 5248dbaecb7da5e90adad46ec20e61aab816cc67 /test-base | |
| parent | 5641b63411eeca54697b32676090c329a8f20e8b (diff) | |
| parent | 95a9dc906f4dd66ebf7530a5597ed817e7ff0e13 (diff) | |
Merge "Revert "Remove legacy-test and legacy-android-test targets"" am: 049c1589ee am: 7f997d4cfc
am: 95a9dc906f
Change-Id: I1034050336bdf8be84e3b86ae346dc4bfe1737ef
Diffstat (limited to 'test-base')
| -rw-r--r-- | test-base/Android.bp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index 8aa0aaf363dd..157609cec09c 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -44,7 +44,7 @@ java_sdk_library { // ========================================== // This is only intended for inclusion in the android.test.runner-minus-junit, // robolectric_android-all-stub and repackaged.android.test.* libraries. -// Must not be used elsewhere. +// Must not be used elewhere. java_library_static { name: "android.test.base_static", installable: false, @@ -61,6 +61,19 @@ java_library_static { sdk_version: "current", } +// Build the legacy-test 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: "legacy-test", + installable: true, + + sdk_version: "current", + static_libs: ["android.test.base_static"], +} + // Build the repackaged.android.test.base library // ============================================== // This contains repackaged versions of the classes from @@ -80,8 +93,8 @@ java_library_static { // =============================================== // This contains the android.test classes from android.test.base plus // the com.android.internal.util.Predicate[s] classes. This is only -// intended for inclusion in android.test.legacy and must not be used -// elsewhere. +// intended for inclusion in the android.test.legacy and +// legacy-android-test static libraries and must not be used elsewhere. java_library_static { name: "android.test.base-minus-junit", |