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

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

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 01124262 am: 06bd4105

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

Change-Id: Ia00d11ee4c75298b67e254e8a51924e5e154e4d5
parents db457de0 06bd4105

java/hiddenapi_singleton.go

+8 −8
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ func moduleForGreyListRemovedApis(ctx android.SingletonContext, module android.M 
}



// flagsRule creates a rule to build hiddenapi-flags.csv out of flags.csv files generated for boot image modules and

// the greylists.

// the unsupported API.

func flagsRule(ctx android.SingletonContext) android.Path {

	var flagsCSV android.Paths

	var greylistRemovedApis android.Paths
@@ -256,18 +256,18 @@ func flagsRule(ctx android.SingletonContext) android.Path { 
		Tool(android.PathForSource(ctx, "frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py")).

		FlagWithInput("--csv ", stubFlags).

		Inputs(flagsCSV).

		FlagWithInput("--greylist ",

		FlagWithInput("--unsupported ",

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

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

		FlagWithInput("--greylist-max-q ",

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

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

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

		FlagWithInput("--greylist-max-p ",

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

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

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

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

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

		FlagWithInput("--blacklist ",

		FlagWithInput("--blocked ",

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

		FlagWithInput("--greylist-packages ",

		FlagWithInput("--unsupported-packages ",

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

		FlagWithOutput("--output ", tempPath)