StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add property to enable adding tools.jar to bootclasspath."

Browse Source
This commit is contained in:
Treehugger Robot
2018-02-06 21:12:16 +00:00
committed by Gerrit Code Review
parent fa54e751d9 5f8cb424aa
commit 97754359cc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java.go
View File

@@ -116,6 +116,9 @@ type CompilerProperties struct {
// The number of Java source entries each Javac instance can process // The number of Java source entries each Javac instance can process
Javac_shard_size *int64 Javac_shard_size *int64
// Add host jdk tools.jar to bootclasspath
Use_tools_jar *bool
Openjdk9 struct { Openjdk9 struct {
// List of source files that should only be used when passing -source 1.9 // List of source files that should only be used when passing -source 1.9
Srcs []string Srcs []string
@@ -694,6 +697,10 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB
flags.bootClasspath = append(flags.bootClasspath, flags.bootClasspath = append(flags.bootClasspath,
android.PathForSource(ctx, java8Home, "jre/lib/jce.jar"), android.PathForSource(ctx, java8Home, "jre/lib/jce.jar"),
android.PathForSource(ctx, java8Home, "jre/lib/rt.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 // systemModules