Merge "Tag removed APIs as such in hiddenapi_flags.csv."

This commit is contained in:
Mathew Inwood
2020-10-26 08:52:11 +00:00
committed by Gerrit Code Review

View File

@@ -258,17 +258,17 @@ func flagsRule(ctx android.SingletonContext) android.Path {
Inputs(flagsCSV). Inputs(flagsCSV).
FlagWithInput("--unsupported ", FlagWithInput("--unsupported ",
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported.txt")). android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported.txt")).
FlagWithInput("--unsupported-ignore-conflicts ", combinedRemovedApis). FlagWithInput("--unsupported ", combinedRemovedApis).Flag("--ignore-conflicts ").FlagWithArg("--tag ", "removed").
FlagWithInput("--max-target-q ", FlagWithInput("--max-target-q ",
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-q.txt")). android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-q.txt")).
FlagWithInput("--max-target-p ", FlagWithInput("--max-target-p ",
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-p.txt")). android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-p.txt")).
FlagWithInput("--max-target-o-ignore-conflicts ", FlagWithInput("--max-target-o ", android.PathForSource(
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")). ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")).Flag("--ignore-conflicts ").
FlagWithInput("--blocked ", FlagWithInput("--blocked ",
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")). android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")).
FlagWithInput("--unsupported-packages ", FlagWithInput("--unsupported ", android.PathForSource(
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")). ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")).Flag("--packages ").
FlagWithOutput("--output ", tempPath) FlagWithOutput("--output ", tempPath)
commitChangeForRestat(rule, tempPath, outputPath) commitChangeForRestat(rule, tempPath, outputPath)