From aa73ae5b59852b5157f047c31d0d7e01533cd2da Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 6 Apr 2021 13:08:26 +0100 Subject: [PATCH] Update build to new location of hiddenapi config files Bug: 179354495 Test: m nothing Change-Id: I563237d46f35ae1d2b99ffaa93f77dfcef5a2b6e --- java/hiddenapi_singleton.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 6ad4ff322..9c51649ee 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -369,20 +369,20 @@ func flagsRule(ctx android.SingletonContext) android.Path { FlagWithInput("--csv ", stubFlags). Inputs(flagsCSV). FlagWithInput("--unsupported ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported.txt")). + android.PathForSource(ctx, "frameworks/base/boot/hiddenapi/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"). + android.PathForSource(ctx, "frameworks/base/boot/hiddenapi/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")). + android.PathForSource(ctx, "frameworks/base/boot/hiddenapi/hiddenapi-max-target-q.txt")). FlagWithInput("--max-target-p ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-p.txt")). + android.PathForSource(ctx, "frameworks/base/boot/hiddenapi/hiddenapi-max-target-p.txt")). FlagWithInput("--max-target-o ", android.PathForSource( - ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")).Flag("--ignore-conflicts ").FlagWithArg("--tag ", "lo-prio"). + ctx, "frameworks/base/boot/hiddenapi/hiddenapi-max-target-o.txt")).Flag("--ignore-conflicts ").FlagWithArg("--tag ", "lo-prio"). FlagWithInput("--blocked ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")). + android.PathForSource(ctx, "frameworks/base/boot/hiddenapi/hiddenapi-force-blocked.txt")). FlagWithInput("--unsupported ", android.PathForSource( - ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")).Flag("--packages "). + ctx, "frameworks/base/boot/hiddenapi/hiddenapi-unsupported-packages.txt")).Flag("--packages "). FlagWithOutput("--output ", tempPath) commitChangeForRestat(rule, tempPath, outputPath)