diff options
| -rw-r--r-- | java/config/config.go | 2 | ||||
| -rw-r--r-- | java/config/makevars.go | 2 | ||||
| -rw-r--r-- | java/hiddenapi.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/java/config/config.go b/java/config/config.go index 2f39c99a5..ef1ecc8b0 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -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") diff --git a/java/config/makevars.go b/java/config/makevars.go index 708a72aa4..df447a129 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -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}") diff --git a/java/hiddenapi.go b/java/hiddenapi.go index b5a021785..63b801a5c 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -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 { |