diff options
| author | Mathew Inwood <mathewi@google.com> | 2020-10-20 15:23:04 +0100 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2020-10-21 15:52:15 +0100 |
| commit | a44e8c515d5467045f8844e56e42b0b91fbb34ad (patch) | |
| tree | 02ad9c10f809baf4028fa6c6e7b5c078a68ff326 /java/hiddenapi_singleton.go | |
| parent | f657ff1d009db514a0f8f1b77e0bd4085c8977cd (diff) | |
Tag removed APIs as such in hiddenapi_flags.csv.
Refactor flags in generate_hiddenapi_lists.py" the invocation to use the
new more flexible schema. Add "--tag removed" to removed.txt APIs so
that we can identify those APIs in the final output.
Test: m -j out/soong/hiddenapi/hiddenapi-flags.csv
Bug: 171300342
Change-Id: I38f2ec7c6e2ff7e5bdd9fe2aeb771d5153a2dc99
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 9d07e41c9..c3ae75e19 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -258,17 +258,17 @@ func flagsRule(ctx android.SingletonContext) android.Path { Inputs(flagsCSV). FlagWithInput("--unsupported ", 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 ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-q.txt")). FlagWithInput("--max-target-p ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-p.txt")). - FlagWithInput("--max-target-o-ignore-conflicts ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")). + FlagWithInput("--max-target-o ", android.PathForSource( + ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")).Flag("--ignore-conflicts "). FlagWithInput("--blocked ", android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")). - FlagWithInput("--unsupported-packages ", - android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")). + FlagWithInput("--unsupported ", android.PathForSource( + ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")).Flag("--packages "). FlagWithOutput("--output ", tempPath) commitChangeForRestat(rule, tempPath, outputPath) |