Merge "Rename class2greylist"
This commit is contained in:
commit
51636c0ae9
|
@ -163,7 +163,7 @@ func init() {
|
|||
|
||||
pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")
|
||||
|
||||
pctx.HostBinToolVariable("Class2Greylist", "class2greylist")
|
||||
pctx.HostBinToolVariable("Class2NonSdkList", "class2nonsdklist")
|
||||
pctx.HostBinToolVariable("HiddenAPI", "hiddenapi")
|
||||
|
||||
hostBinToolVariableWithSdkToolsPrebuilt("Aapt2Cmd", "aapt2")
|
||||
|
|
|
@ -75,7 +75,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
|
|||
|
||||
ctx.Strict("ANDROID_MANIFEST_MERGER", "${ManifestMergerCmd}")
|
||||
|
||||
ctx.Strict("CLASS2GREYLIST", "${Class2Greylist}")
|
||||
ctx.Strict("CLASS2NONSDKLIST", "${Class2NonSdkList}")
|
||||
ctx.Strict("HIDDENAPI", "${HiddenAPI}")
|
||||
|
||||
ctx.Strict("DEX_FLAGS", "${DexFlags}")
|
||||
|
|
|
@ -23,8 +23,8 @@ import (
|
|||
)
|
||||
|
||||
var hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{
|
||||
Command: "${config.Class2Greylist} --stub-api-flags ${stubAPIFlags} $in $outFlag $out",
|
||||
CommandDeps: []string{"${config.Class2Greylist}"},
|
||||
Command: "${config.Class2NonSdkList} --stub-api-flags ${stubAPIFlags} $in $outFlag $out",
|
||||
CommandDeps: []string{"${config.Class2NonSdkList}"},
|
||||
}, "outFlag", "stubAPIFlags")
|
||||
|
||||
type hiddenAPI struct {
|
||||
|
|
Loading…
Reference in New Issue