diff options
| author | 2020-07-30 12:09:00 +0000 | |
|---|---|---|
| committer | 2020-07-30 12:09:00 +0000 | |
| commit | 01124262f08308891ad458e6475bf5408168abed (patch) | |
| tree | cd1b56324a5141a2a53a65a4dac54332957f3106 /java/hiddenapi_singleton.go | |
| parent | b0c4d3b319eb65ea296980c094a78d0181bfef4b (diff) | |
| parent | f0f5cdc1cccbf95c145267c36e855907105a3222 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance"
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index bff591cb0..7afba2a79 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -208,7 +208,7 @@ func stubFlagsRule(ctx android.SingletonContext) { } // flagsRule creates a rule to build hiddenapi-flags.csv out of flags.csv files generated for boot image modules and -// the greylists. +// the unsupported API. func flagsRule(ctx android.SingletonContext) android.Path { var flagsCSV android.Paths var greylistRemovedApis android.Paths @@ -247,18 +247,18 @@ func flagsRule(ctx android.SingletonContext) android.Path { Tool(android.PathForSource(ctx, "frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py")). FlagWithInput("--csv ", stubFlags). Inputs(flagsCSV). - FlagWithInput("--greylist ", + FlagWithInput("--unsupported ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist.txt")). - FlagWithInput("--greylist-ignore-conflicts ", combinedRemovedApis). - FlagWithInput("--greylist-max-q ", + FlagWithInput("--unsupported-ignore-conflicts ", combinedRemovedApis). + FlagWithInput("--max-target-q ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-q.txt")). - FlagWithInput("--greylist-max-p ", + FlagWithInput("--max-target-p ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-p.txt")). - FlagWithInput("--greylist-max-o-ignore-conflicts ", + FlagWithInput("--max-target-o-ignore-conflicts ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-o.txt")). - FlagWithInput("--blacklist ", + FlagWithInput("--blocked ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blacklist.txt")). - FlagWithInput("--greylist-packages ", + FlagWithInput("--unsupported-packages ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-packages.txt")). FlagWithOutput("--output ", tempPath) |