tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add property to enable adding tools.jar to bootclasspath." am: 97754359cc am: 0965552a5b

Browse source 
am: 18ce234234

Change-Id: Ibb10696e7aa17b789987eb1d05d5ecd99f226f0a
This commit is contained in:
Nan Zhang 2018-02-06 23:00:15 +00:00 committed by android-build-merger
commit 69b86ee6df
1 changed files with 7 additions and 0 deletions
Show stats 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