Add property to enable adding tools.jar to bootclasspath.
Converting Doclava to Soong need tools.jar as one of its bootclasspaths.
Test: m doclava
Bug: b/70351683
Change-Id: I0ac65fcbe1eadfc57239cde2e83b80cf441a9b69
diff --git a/java/java.go b/java/java.go
index a6769e7..b2fbc42 100644
--- a/java/java.go
+++ b/java/java.go
@@ -116,6 +116,9 @@
// The number of Java source entries each Javac instance can process
Javac_shard_size *int64
+ // Add host jdk tools.jar to bootclasspath
+ Use_tools_jar *bool
+
Openjdk9 struct {
// List of source files that should only be used when passing -source 1.9
Srcs []string
@@ -694,6 +697,10 @@
flags.bootClasspath = append(flags.bootClasspath,
android.PathForSource(ctx, java8Home, "jre/lib/jce.jar"),
android.PathForSource(ctx, java8Home, "jre/lib/rt.jar"))
+ if Bool(j.properties.Use_tools_jar) {
+ flags.bootClasspath = append(flags.bootClasspath,
+ android.PathForSource(ctx, java8Home, "lib/tools.jar"))
+ }
}
// systemModules