From c1be2f810599859a2806413ff72643d7d6466365 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Wed, 13 Jan 2021 15:49:17 +0000 Subject: [PATCH] Move temp blocklist APIs to max-sdk-r list. These APIs were temporarily blocked but are now being moved to the max-sdk-r for final release. Tag these APIs as "lo-prio" since we believe that they are unused. Bug: 173499988 Test: m Change-Id: If9c6be963faa75df77cf3cc7761b384324c8cd3e --- java/hiddenapi_singleton.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 419dc3424..d3025247b 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -251,6 +251,8 @@ func flagsRule(ctx android.SingletonContext) android.Path { FlagWithInput("--unsupported ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported.txt")). FlagWithInput("--unsupported ", combinedRemovedApis).Flag("--ignore-conflicts ").FlagWithArg("--tag ", "removed"). + FlagWithInput("--max-target-r ", + android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-r-loprio.txt")).FlagWithArg("--tag ", "lo-prio"). FlagWithInput("--max-target-q ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-q.txt")). FlagWithInput("--max-target-p ", @@ -259,8 +261,6 @@ func flagsRule(ctx android.SingletonContext) android.Path { ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")).Flag("--ignore-conflicts ").FlagWithArg("--tag ", "lo-prio"). FlagWithInput("--blocked ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")). - FlagWithInput("--blocked ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-temp-blocklist.txt")).FlagWithArg("--tag ", "lo-prio"). FlagWithInput("--unsupported ", android.PathForSource( ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")).Flag("--packages "). FlagWithOutput("--output ", tempPath)