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

Merge "Rename class2greylist"

Browse source
This commit is contained in:
Treehugger Robot 2020-08-17 16:33:21 +00:00 committed by Gerrit Code Review
commit 51636c0ae9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/config/config.go
View file

@ -163,7 +163,7 @@ func init() {
pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger") pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")
pctx.HostBinToolVariable("Class2Greylist", "class2greylist") pctx.HostBinToolVariable("Class2NonSdkList", "class2nonsdklist")
pctx.HostBinToolVariable("HiddenAPI", "hiddenapi") pctx.HostBinToolVariable("HiddenAPI", "hiddenapi")
hostBinToolVariableWithSdkToolsPrebuilt("Aapt2Cmd", "aapt2") hostBinToolVariableWithSdkToolsPrebuilt("Aapt2Cmd", "aapt2")

2
java/config/makevars.go
View file

@ -75,7 +75,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("ANDROID_MANIFEST_MERGER", "${ManifestMergerCmd}") ctx.Strict("ANDROID_MANIFEST_MERGER", "${ManifestMergerCmd}")
ctx.Strict("CLASS2GREYLIST", "${Class2Greylist}") ctx.Strict("CLASS2NONSDKLIST", "${Class2NonSdkList}")
ctx.Strict("HIDDENAPI", "${HiddenAPI}") ctx.Strict("HIDDENAPI", "${HiddenAPI}")
ctx.Strict("DEX_FLAGS", "${DexFlags}") ctx.Strict("DEX_FLAGS", "${DexFlags}")

4
java/hiddenapi.go
View file

@ -23,8 +23,8 @@ import (
) )
var hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{ var hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{
Command: "${config.Class2Greylist} --stub-api-flags ${stubAPIFlags} $in $outFlag $out", Command: "${config.Class2NonSdkList} --stub-api-flags ${stubAPIFlags} $in $outFlag $out",
CommandDeps: []string{"${config.Class2Greylist}"}, CommandDeps: []string{"${config.Class2NonSdkList}"},
}, "outFlag", "stubAPIFlags") }, "outFlag", "stubAPIFlags")
type hiddenAPI struct { type hiddenAPI struct {