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

Merge "Convert RuleBuilder to static rule in buildRuleToGenerateIndex" am: 7ae8afc115 am: b1706744f3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2436674

Change-Id: I829a1dc1418536c19f67a4c27c336d4666a57400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-02-15 09:06:57 +00:00
committed by Automerger Merge Worker
parent bf4a62dfe6 b1706744f3
commit 41bda3ee00
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/config/config.go
View File

@@ -195,6 +195,7 @@ func init() {
pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger") pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")
pctx.HostBinToolVariable("Class2NonSdkList", "class2nonsdklist") pctx.HostBinToolVariable("Class2NonSdkList", "class2nonsdklist")
pctx.HostBinToolVariable("MergeCsvCommand", "merge_csv")
pctx.HostBinToolVariable("HiddenAPI", "hiddenapi") pctx.HostBinToolVariable("HiddenAPI", "hiddenapi")
hostBinToolVariableWithSdkToolsPrebuilt("Aapt2Cmd", "aapt2") hostBinToolVariableWithSdkToolsPrebuilt("Aapt2Cmd", "aapt2")

29
java/hiddenapi.go
View File

@@ -20,10 +20,17 @@ import (
"android/soong/android" "android/soong/android"
) )
var hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{ var (
Command: "${config.Class2NonSdkList} --stub-api-flags ${stubAPIFlags} $in $outFlag $out", hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{
CommandDeps: []string{"${config.Class2NonSdkList}"}, Command: "${config.Class2NonSdkList} --stub-api-flags ${stubAPIFlags} $in $outFlag $out",
}, "outFlag", "stubAPIFlags") CommandDeps: []string{"${config.Class2NonSdkList}"},
}, "outFlag", "stubAPIFlags")
hiddenAPIGenerateIndexRule = pctx.AndroidStaticRule("hiddenAPIGenerateIndex", blueprint.RuleParams{
Command: "${config.MergeCsvCommand} --zip_input --key_field signature --output=$out $in",
CommandDeps: []string{"${config.MergeCsvCommand}"},
})
)
type hiddenAPI struct { type hiddenAPI struct {
// True if the module containing this structure contributes to the hiddenapi information or has // True if the module containing this structure contributes to the hiddenapi information or has
@@ -216,14 +223,12 @@ func buildRuleToGenerateMetadata(ctx android.ModuleContext, desc string, classes
// created by the unsupported app usage annotation processor during compilation of the class // created by the unsupported app usage annotation processor during compilation of the class
// implementation jar. // implementation jar.
func buildRuleToGenerateIndex(ctx android.ModuleContext, desc string, classesJars android.Paths, indexCSV android.WritablePath) { func buildRuleToGenerateIndex(ctx android.ModuleContext, desc string, classesJars android.Paths, indexCSV android.WritablePath) {
rule := android.NewRuleBuilder(pctx, ctx) ctx.Build(pctx, android.BuildParams{
rule.Command(). Rule: hiddenAPIGenerateIndexRule,
BuiltTool("merge_csv"). Description: desc,
Flag("--zip_input"). Inputs: classesJars,
Flag("--key_field signature"). Output: indexCSV,
FlagWithOutput("--output=", indexCSV). })
Inputs(classesJars)
rule.Build(desc, desc)
} }
var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", blueprint.RuleParams{ var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", blueprint.RuleParams{