From 1fee9f3dd0e2ec4b6142bd6cd03d35e5de9d1eb2 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 4 Oct 2018 11:45:49 +0100 Subject: Include all core libs in default boot classpath To migrate the default compilation over to using "core platform api" stubs we need to make the "before" state as close to the "after" state as possible. The stubs will include all "core libraries" so it makes sense to include those that contribute to the "core platform api": okhttp, bouncycastle and conscrypt. (apache-xml is not included because it doesn't contribute to the core platform API). After this change all explicit dependencies to okhttp, bouncycastle and conscrypt in situations where the default boot classpath is used can be removed. A knock-on of this change is that the conscrypt, bouncycastle and okhttp targets need to be adjusted to explicitly depend on core-oj / core-libart with no_standard_libs: true to avoid a cycle. Bug: 113148576 Test: treehugger Change-Id: I1677af8d9d48fd026874ebce4c864f39ec1a5a3d --- java/java_test.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'java/java_test.go') 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"], -- cgit v1.2.3-59-g8ed1b