StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tag removed APIs as such in hiddenapi_flags.csv." am: 1e8118da95 am: 6123adab59

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469622

Change-Id: If26a26cac5e02383b1e995c0696f8eb129606fc4
This commit is contained in:
Mathew Inwood
2020-10-26 09:59:07 +00:00
committed by Automerger Merge Worker
parent 9b86288da8 6123adab59
commit 1f4b17f49e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/hiddenapi_singleton.go
View File

@@ -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)