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

Merge "Turn missing jarjar output files into errors"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-08 23:47:13 +00:00
committed by Gerrit Code Review
parent 3b9b0a11e9 d97cf63cdf
commit ed7bfd9726
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/builder.go
View File

@@ -193,12 +193,19 @@ var (
jarjar = pctx.AndroidStaticRule("jarjar", jarjar = pctx.AndroidStaticRule("jarjar",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "${config.JavaCmd} ${config.JavaVmFlags}" + Command: "" +
// Jarjar doesn't exit with an error when the rules file contains a syntax error,
// leading to stale or missing files later in the build. Remove the output file
// before running jarjar.
"rm -f ${out} && " +
"${config.JavaCmd} ${config.JavaVmFlags}" +
// b/146418363 Enable Android specific jarjar transformer to drop compat annotations // b/146418363 Enable Android specific jarjar transformer to drop compat annotations
// for newly repackaged classes. Dropping @UnsupportedAppUsage on repackaged classes // for newly repackaged classes. Dropping @UnsupportedAppUsage on repackaged classes
// avoids adding new hiddenapis after jarjar'ing. // avoids adding new hiddenapis after jarjar'ing.
" -DremoveAndroidCompatAnnotations=true" + " -DremoveAndroidCompatAnnotations=true" +
" -jar ${config.JarjarCmd} process $rulesFile $in $out", " -jar ${config.JarjarCmd} process $rulesFile $in $out && " +
// Turn a missing output file into a ninja error
`[ -e ${out} ] || (echo "Missing output file"; exit 1)`,
CommandDeps: []string{"${config.JavaCmd}", "${config.JarjarCmd}", "$rulesFile"}, CommandDeps: []string{"${config.JavaCmd}", "${config.JarjarCmd}", "$rulesFile"},
}, },
"rulesFile") "rulesFile")