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

Commit aa73ae5b authored by Paul Duffin's avatar Paul Duffin
Browse files

Update build to new location of hiddenapi config files 

Bug: 179354495
Test: m nothing
Change-Id: I563237d46f35ae1d2b99ffaa93f77dfcef5a2b6e
parent 8f8029a9

java/hiddenapi_singleton.go

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