diff options
| author | Sundong Ahn <sundongahn@google.com> | 2018-12-12 20:52:02 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-12 20:52:02 -0800 |
| commit | 78a6782dbb51c720af92ee6ca609a30d6fc5431c (patch) | |
| tree | e26c5fe555bf49dbd8ee86ff1212cc6be3233165 | |
| parent | 4bbddfe9dd9cf95083571851a5b91ebe66b41a24 (diff) | |
| parent | d1eae3244e09802e185fbfbbb716fb0ecfabeb2d (diff) | |
Merge "Switch to metalava" am: f53c398133
am: d1eae3244e
Change-Id: Id94c3df35f9939c7f3b759d048affe7f22fa6e24
| -rw-r--r-- | test-base/Android.bp | 2 | ||||
| -rw-r--r-- | test-runner/Android.bp | 2 | ||||
| -rw-r--r-- | test-runner/api/current.txt | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index 4d765d3e5f3f..157609cec09c 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -37,8 +37,6 @@ java_sdk_library { "junit.framework", ], - droiddoc_options: ["-stubsourceonly"], - metalava_enabled: false, compile_dex: true, } diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 0a0d50cc330c..db5053eeb903 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -40,8 +40,6 @@ java_sdk_library { "junit.textui", ], - droiddoc_options: ["-stubsourceonly"], - metalava_enabled: false, compile_dex: true } diff --git a/test-runner/api/current.txt b/test-runner/api/current.txt index 1170eb53ab7f..4ba1b8f2fdc1 100644 --- a/test-runner/api/current.txt +++ b/test-runner/api/current.txt @@ -125,8 +125,8 @@ package android.test { method public static void assertEquals(double[], double[]); method public static void assertEquals(java.lang.String, java.lang.Object[], java.lang.Object[]); method public static void assertEquals(java.lang.Object[], java.lang.Object[]); - method public static void assertEquals(java.lang.String, java.util.Set<? extends java.lang.Object>, java.util.Set<? extends java.lang.Object>); - method public static void assertEquals(java.util.Set<? extends java.lang.Object>, java.util.Set<? extends java.lang.Object>); + method public static void assertEquals(java.lang.String, java.util.Set<?>, java.util.Set<?>); + method public static void assertEquals(java.util.Set<?>, java.util.Set<?>); method public static java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String, java.lang.String); method public static java.util.regex.MatchResult assertMatchesRegex(java.lang.String, java.lang.String); method public static void assertNotContainsRegex(java.lang.String, java.lang.String, java.lang.String); |