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

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

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

Change-Id: I43299692a74aa8d42ce39fdf8c6228e34c200f27
This commit is contained in:
Andrei-Valentin Onea
2020-07-30 12:30:24 +00:00
committed by Automerger Merge Worker
parent feb217de25 01124262f0
commit 06bd410548
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/hiddenapi_singleton.go
View File

@@ -208,7 +208,7 @@ func stubFlagsRule(ctx android.SingletonContext) {
} }
// flagsRule creates a rule to build hiddenapi-flags.csv out of flags.csv files generated for boot image modules and // 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 { func flagsRule(ctx android.SingletonContext) android.Path {
var flagsCSV android.Paths var flagsCSV android.Paths
var greylistRemovedApis android.Paths var greylistRemovedApis android.Paths
@@ -247,18 +247,18 @@ func flagsRule(ctx android.SingletonContext) android.Path {
Tool(android.PathForSource(ctx, "frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py")). Tool(android.PathForSource(ctx, "frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py")).
FlagWithInput("--csv ", stubFlags). FlagWithInput("--csv ", stubFlags).
Inputs(flagsCSV). Inputs(flagsCSV).
FlagWithInput("--greylist ", FlagWithInput("--unsupported ",
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist.txt")). android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist.txt")).
FlagWithInput("--greylist-ignore-conflicts ", combinedRemovedApis). FlagWithInput("--unsupported-ignore-conflicts ", combinedRemovedApis).
FlagWithInput("--greylist-max-q ", FlagWithInput("--max-target-q ",
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-q.txt")). 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")). 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")). 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")). 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")). android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-packages.txt")).
FlagWithOutput("--output ", tempPath) FlagWithOutput("--output ", tempPath)