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

Commit 23fea04e authored by Andrei Onea's avatar Andrei Onea
Browse files

Rename class2greylist 

Use a more inclusive name (go/hiddenapi-list-renaming).
Bug: 163797539
Test: atest class2nonsdklisttest

Change-Id: I1b72c243746dde9926a11d5a559b84e753e8fd4f
parent 29737cfc

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 {