diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 3 | ||||
| -rw-r--r-- | java/java_test.go | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/java/config/config.go b/java/config/config.go index fa8cb0f55..612934950 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -27,7 +27,7 @@ import ( var ( pctx = android.NewPackageContext("android/soong/java/config") - DefaultBootclasspathLibraries = []string{"core-oj", "core-libart"} + DefaultBootclasspathLibraries = []string{"core-oj", "core-libart", "core-simple"} DefaultSystemModules = "core-system-modules" DefaultLibraries = []string{"ext", "framework", "okhttp"} DefaultLambdaStubsLibrary = "core-lambda-stubs" @@ -43,6 +43,7 @@ var ( "android.car7", "core-oj", "core-libart", + "core-simple", } ManifestMergerClasspath = []string{ diff --git a/java/java_test.go b/java/java_test.go index 72341ee26..c9f3dbf17 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -101,6 +101,7 @@ func testContext(config android.Config, bp string, "core-oj", "core-libart", "core-lambda-stubs", + "core-simple", "framework", "ext", "okhttp", @@ -353,14 +354,14 @@ var classpathTestcases = []struct { }{ { name: "default", - bootclasspath: []string{"core-oj", "core-libart"}, + bootclasspath: []string{"core-oj", "core-libart", "core-simple"}, system: "core-system-modules", classpath: []string{"ext", "framework", "okhttp"}, }, { name: "blank sdk version", properties: `sdk_version: "",`, - bootclasspath: []string{"core-oj", "core-libart"}, + bootclasspath: []string{"core-oj", "core-libart", "core-simple"}, system: "core-system-modules", classpath: []string{"ext", "framework", "okhttp"}, }, |