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

Commit 6214fa76 authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Rename hiddenapi manual lists" am: fe58347a 

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

Change-Id: I2f3164eb4e8fe20f4989702316b65d85ccb8c261
parents 06c5c9c3 fe58347a

java/hiddenapi_singleton.go

+6 −6
Original line number Diff line number Diff line
@@ -248,18 +248,18 @@ func flagsRule(ctx android.SingletonContext) android.Path { 
		FlagWithInput("--csv ", stubFlags).

		Inputs(flagsCSV).

		FlagWithInput("--unsupported ",

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist.txt")).

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported.txt")).

		FlagWithInput("--unsupported-ignore-conflicts ", combinedRemovedApis).

		FlagWithInput("--max-target-q ",

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-q.txt")).

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-q.txt")).

		FlagWithInput("--max-target-p ",

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-p.txt")).

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-p.txt")).

		FlagWithInput("--max-target-o-ignore-conflicts ",

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-o.txt")).

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")).

		FlagWithInput("--blocked ",

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blacklist.txt")).

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")).

		FlagWithInput("--unsupported-packages ",

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-packages.txt")).

			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")).

		FlagWithOutput("--output ", tempPath)



	commitChangeForRestat(rule, tempPath, outputPath)