diff options
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/java/java_test.go b/java/java_test.go index 1bfd24bbc..76244f04b 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -115,9 +115,11 @@ func testContext(config android.Config, bp string, "core-libart", "core-lambda-stubs", "core-simple", + "bouncycastle", + "conscrypt", + "okhttp", "framework", "ext", - "okhttp", "android_stubs_current", "android_system_stubs_current", "android_test_stubs_current", @@ -365,16 +367,16 @@ var classpathTestcases = []struct { }{ { name: "default", - bootclasspath: []string{"core-oj", "core-libart", "core-simple"}, + bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"}, system: "core-system-modules", - classpath: []string{"ext", "framework", "okhttp"}, + classpath: []string{"ext", "framework"}, }, { name: "blank sdk version", properties: `sdk_version: "",`, - bootclasspath: []string{"core-oj", "core-libart", "core-simple"}, + bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"}, system: "core-system-modules", - classpath: []string{"ext", "framework", "okhttp"}, + classpath: []string{"ext", "framework"}, }, { @@ -1062,12 +1064,6 @@ func TestJavaSdkLibrary(t *testing.T) { name: "droiddoc-templates-sdk", path: ".", } - java_library { - name: "conscrypt", - } - java_library { - name: "bouncycastle", - } java_sdk_library { name: "foo", srcs: ["a.java", "b.java"], |