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

Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations."

Browse Source
This commit is contained in:
Ramy Medhat
2020-06-09 12:17:38 +00:00
committed by Gerrit Code Review
parent 8b1531e7df c8d60bc7c6
commit 4e372f7841
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/droiddoc.go
View File

@@ -1424,10 +1424,9 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
rule.HighMem() rule.HighMem()
cmd := rule.Command() cmd := rule.Command()
rspFile := "" var implicitsRsp android.WritablePath
if len(implicits) > 0 { if len(implicits) > 0 {
implicitsRsp := android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"implicits.rsp") implicitsRsp = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"implicits.rsp")
rspFile = implicitsRsp.String()
impRule := android.NewRuleBuilder() impRule := android.NewRuleBuilder()
impCmd := impRule.Command() impCmd := impRule.Command()
// A dummy action that copies the ninja generated rsp file to a new location. This allows us to // A dummy action that copies the ninja generated rsp file to a new location. This allows us to
@@ -1454,10 +1453,10 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
inputs = append(inputs, strings.Split(v, ",")...) inputs = append(inputs, strings.Split(v, ",")...)
} }
cmd.Text((&remoteexec.REParams{ cmd.Text((&remoteexec.REParams{
Labels: map[string]string{"type": "compile", "lang": "java", "compiler": "metalava"}, Labels: map[string]string{"type": "compile", "lang": "java", "compiler": "metalava", "shallow": "true"},
ExecStrategy: execStrategy, ExecStrategy: execStrategy,
Inputs: inputs, Inputs: inputs,
RSPFile: rspFile, RSPFile: implicitsRsp.String(),
ToolchainInputs: []string{config.JavaCmd(ctx).String()}, ToolchainInputs: []string{config.JavaCmd(ctx).String()},
Platform: map[string]string{remoteexec.PoolKey: pool}, Platform: map[string]string{remoteexec.PoolKey: pool},
}).NoVarTemplate(ctx.Config())) }).NoVarTemplate(ctx.Config()))
@@ -1468,7 +1467,12 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
FlagWithArg("-encoding ", "UTF-8"). FlagWithArg("-encoding ", "UTF-8").
FlagWithArg("-source ", javaVersion.String()). FlagWithArg("-source ", javaVersion.String()).
FlagWithRspFileInputList("@", srcs). FlagWithRspFileInputList("@", srcs).
FlagWithInput("@", srcJarList) FlagWithInput("@", srcJarList).
FlagWithOutput("--strict-input-files:warn ", android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"violations.txt"))
if implicitsRsp.String() != "" {
cmd.FlagWithArg("--strict-input-files-exempt ", "@"+implicitsRsp.String())
}
if len(bootclasspath) > 0 { if len(bootclasspath) > 0 {
cmd.FlagWithInputList("-bootclasspath ", bootclasspath.Paths(), ":") cmd.FlagWithInputList("-bootclasspath ", bootclasspath.Paths(), ":")