diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-07 15:52:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-07 15:52:06 +0000 |
| commit | 5bdc83c20acda26d377a2ce7e7ae1ed41574da31 (patch) | |
| tree | 9ee5416f8fbd8a5b8093f30852ad4811137e8fcf /java/hiddenapi_singleton.go | |
| parent | 4896da1444fac8f4663cc7ffadd2d9dd17c6f2ba (diff) | |
| parent | aa73ae5b59852b5157f047c31d0d7e01533cd2da (diff) | |
Merge "Update build to new location of hiddenapi config files"
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 0e9b6c528..7e9477bfe 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -358,20 +358,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) |