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

Merge changes Ic2a585ea,I11ccabc4,Icc932c4a,I020556c7,I08713e91

Browse Source 
am: ed9a92c311

Change-Id: I0367335939181566063b777184e864a7afb02308
This commit is contained in:
Colin Cross
2019-07-22 14:04:58 -07:00
committed by android-build-merger
parent cebbe099df ed9a92c311
commit a373a94fc0
7 changed files with 720 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
java/config/config.go
View File

@@ -48,6 +48,11 @@ var (
}
)
const (
JavaVmFlags = `-XX:OnError="cat hs_err_pid%p.log" -XX:CICompilerCount=6 -XX:+UseDynamicNumberOfGCThreads`
JavacVmFlags = `-J-XX:OnError="cat hs_err_pid%p.log" -J-XX:CICompilerCount=6 -J-XX:+UseDynamicNumberOfGCThreads`
)
func init() {
pctx.Import("github.com/google/blueprint/bootstrap")
@@ -70,8 +75,9 @@ func init() {
// b/65004097: prevent using java.lang.invoke.StringConcatFactory when using -target 1.9
`-XDstringConcat=inline`,
}, " "))
pctx.StaticVariable("JavaVmFlags", "-XX:OnError=\"cat hs_err_pid%p.log\" -XX:CICompilerCount=6 -XX:+UseDynamicNumberOfGCThreads")
pctx.StaticVariable("JavacVmFlags", "-J-XX:OnError=\"cat hs_err_pid%p.log\" -J-XX:CICompilerCount=6 -J-XX:+UseDynamicNumberOfGCThreads")
pctx.StaticVariable("JavaVmFlags", JavaVmFlags)
pctx.StaticVariable("JavacVmFlags", JavacVmFlags)
pctx.VariableConfigMethod("hostPrebuiltTag", android.Config.PrebuiltOS)
@@ -155,3 +161,41 @@ func init() {
pctx.HostBinToolVariable("Class2Greylist", "class2greylist")
pctx.HostBinToolVariable("HiddenAPI", "hiddenapi")
}
// JavaCmd returns a SourcePath object with the path to the java command.
func JavaCmd(ctx android.PathContext) android.SourcePath {
return javaTool(ctx, "java")
}
// JavadocCmd returns a SourcePath object with the path to the java command.
func JavadocCmd(ctx android.PathContext) android.SourcePath {
return javaTool(ctx, "javadoc")
}
func javaTool(ctx android.PathContext, tool string) android.SourcePath {
type javaToolKey string
key := android.NewCustomOnceKey(javaToolKey(tool))
return ctx.Config().OnceSourcePath(key, func() android.SourcePath {
return javaToolchain(ctx).Join(ctx, tool)
})
}
var javaToolchainKey = android.NewOnceKey("javaToolchain")
func javaToolchain(ctx android.PathContext) android.SourcePath {
return ctx.Config().OnceSourcePath(javaToolchainKey, func() android.SourcePath {
return javaHome(ctx).Join(ctx, "bin")
})
}
var javaHomeKey = android.NewOnceKey("javaHome")
func javaHome(ctx android.PathContext) android.SourcePath {
return ctx.Config().OnceSourcePath(javaHomeKey, func() android.SourcePath {
// This is set up and guaranteed by soong_ui
return android.PathForSource(ctx, ctx.Config().Getenv("ANDROID_JAVA_HOME"))
})
}