Track changes to add core-simple to the boot cp
See the change in build/make for details.
Bug: 113148576
Test: make checkbuild / Treehugger
Change-Id: I6f7901642c6b907b1e8e9dd31ced3bf1ea6dfd4d
diff --git a/java/config/config.go b/java/config/config.go
index fa8cb0f..6129349 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -27,7 +27,7 @@
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 @@
"android.car7",
"core-oj",
"core-libart",
+ "core-simple",
}
ManifestMergerClasspath = []string{
diff --git a/java/java_test.go b/java/java_test.go
index 72341ee..c9f3dbf 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -101,6 +101,7 @@
"core-oj",
"core-libart",
"core-lambda-stubs",
+ "core-simple",
"framework",
"ext",
"okhttp",
@@ -353,14 +354,14 @@
}{
{
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"},
},