From ca79081bded72751cb96385cc0039d9eedb8bb9d Mon Sep 17 00:00:00 2001 From: Andrei Onea Date: Tue, 4 Aug 2020 15:34:35 +0100 Subject: [PATCH] Rename hiddenapi manual lists Use new names for lists from go/hiddenapi-list-renaming Bug: 162827370 Test: m Change-Id: I9522f32faa46d1d49aefad0921ba6d9c427d8779 --- java/hiddenapi_singleton.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 7afba2a79..1e6becbf8 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -248,18 +248,18 @@ func flagsRule(ctx android.SingletonContext) android.Path { FlagWithInput("--csv ", stubFlags). Inputs(flagsCSV). FlagWithInput("--unsupported ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist.txt")). + android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported.txt")). FlagWithInput("--unsupported-ignore-conflicts ", combinedRemovedApis). FlagWithInput("--max-target-q ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-q.txt")). + android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-q.txt")). FlagWithInput("--max-target-p ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-p.txt")). + android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-p.txt")). FlagWithInput("--max-target-o-ignore-conflicts ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-o.txt")). + android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")). FlagWithInput("--blocked ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blacklist.txt")). + android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")). FlagWithInput("--unsupported-packages ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-packages.txt")). + android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")). FlagWithOutput("--output ", tempPath) commitChangeForRestat(rule, tempPath, outputPath)