Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51636c0a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename class2greylist"

parents ba161370 23fea04e

java/config/config.go

+1 −1
Original line number Diff line number Diff line
@@ -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")

java/config/makevars.go

+1 −1
Original line number Diff line number Diff line
@@ -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}")

java/hiddenapi.go

+2 −2
Original line number Diff line number Diff line
@@ -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 {