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

Merge "Rename class2greylist" am: 51636c0ae9

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

Change-Id: I636354f2b13cd9352855faf66b10d273318dfcbe
This commit is contained in:
Treehugger Robot
2020-08-17 16:35:29 +00:00
committed by Automerger Merge Worker
parent 1fe098e329 51636c0ae9
commit 73a14bb9e5
3 changed files with 4 additions and 4 deletions
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("Class2Greylist", "class2greylist")
pctx.HostBinToolVariable("Class2NonSdkList", "class2nonsdklist")
pctx.HostBinToolVariable("HiddenAPI", "hiddenapi")
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("CLASS2GREYLIST", "${Class2Greylist}")
ctx.Strict("CLASS2NONSDKLIST", "${Class2NonSdkList}")
ctx.Strict("HIDDENAPI", "${HiddenAPI}")
ctx.Strict("DEX_FLAGS", "${DexFlags}")

4
java/hiddenapi.go
View File

@@ -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 {