diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-02-18 07:44:41 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-18 07:44:41 -0800 |
| commit | 0cc3064adabf4cb78fce3bb37105e85a2267717b (patch) | |
| tree | 5f423f4733893cccbb1b53955ee51c07c51c72b2 /test-base | |
| parent | 45161105700e9ed371ce09e143498e300896c8fb (diff) | |
| parent | 9248379c9834e372d48317263e386e01b74267b8 (diff) | |
Merge "Remove legacy-test and legacy-android-test targets" am: 14daedf747 am: 4a83feb18a
am: 9248379c98
Change-Id: Ia409c6c4596269120386f8ae47d7f6379a1073bf
Diffstat (limited to 'test-base')
| -rw-r--r-- | test-base/Android.bp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index 157609cec09c..8aa0aaf363dd 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 elewhere. +// Must not be used elsewhere. java_library_static { name: "android.test.base_static", installable: false, @@ -61,19 +61,6 @@ 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 @@ -93,8 +80,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 the android.test.legacy and -// legacy-android-test static libraries and must not be used elsewhere. +// intended for inclusion in android.test.legacy and must not be used +// elsewhere. java_library_static { name: "android.test.base-minus-junit", |