Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a44e8c51 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

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
parent f657ff1d

java/hiddenapi_singleton.go

+5 −5
Original line number Diff line number Diff line
@@ -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)