diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-02-26 04:16:34 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-26 04:16:34 -0800 |
| commit | eec4726e3cb9410faa8e94057d864920c0017f14 (patch) | |
| tree | 19abe13a4fc43720b39d2076454971c2cb84ff40 /test-base | |
| parent | 83624df78e9854c65853a91721ba2bc71c74e713 (diff) | |
| parent | a8025a851d917bfed6f0ae6d4b174d53d9b53303 (diff) | |
Merge "Revert "Revert "Remove legacy-test and legacy-android-test targets""" am: e051b0c95e am: 643318f4d2
am: a8025a851d
Change-Id: Ibe9fce04c43c435764c313f64bf49e03fa826012
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", |