From 26420f6345dbd9d5d013fc8fc9bea7d98c026811 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Tue, 20 Nov 2018 17:47:23 +0900 Subject: Switch to metalava android.test.base and android.test.runner libraries are changed to using metalava instead of docalava Bug: 119625999 Test: m -j Change-Id: I589ea59240f8b5d442931a1f1b614221d9eaf221 --- test-runner/Android.bp | 2 -- test-runner/api/current.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'test-runner') 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, java.util.Set); - method public static void assertEquals(java.util.Set, java.util.Set); + 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); -- cgit v1.2.3