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

Merge "Include car project in grey list removed apis" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-08 18:07:38 +00:00
committed by Android (Google) Code Review
parent a109682456 9791efa3e8
commit 50cea1a76e
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/hiddenapi_singleton.go
View File

@@ -207,6 +207,15 @@ func stubFlagsRule(ctx android.SingletonContext) {
rule.Build(pctx, ctx, "hiddenAPIStubFlagsFile", "hiddenapi stub flags") rule.Build(pctx, ctx, "hiddenAPIStubFlagsFile", "hiddenapi stub flags")
} }
func moduleForGreyListRemovedApis(ctx android.SingletonContext, module android.Module) bool {
switch ctx.ModuleName(module) {
case "api-stubs-docs", "system-api-stubs-docs", "android.car-stubs-docs", "android.car-system-stubs-docs":
return true
default:
return false
}
}
// 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 greylists.
func flagsRule(ctx android.SingletonContext) android.Path { func flagsRule(ctx android.SingletonContext) android.Path {
@@ -222,7 +231,7 @@ func flagsRule(ctx android.SingletonContext) android.Path {
// Track @removed public and system APIs via corresponding droidstubs targets. // Track @removed public and system APIs via corresponding droidstubs targets.
// These APIs are not present in the stubs, however, we have to keep allowing access // These APIs are not present in the stubs, however, we have to keep allowing access
// to them at runtime. // to them at runtime.
if m := ctx.ModuleName(module); m == "api-stubs-docs" || m == "system-api-stubs-docs" { if moduleForGreyListRemovedApis(ctx, module) {
greylistRemovedApis = append(greylistRemovedApis, ds.removedDexApiFile) greylistRemovedApis = append(greylistRemovedApis, ds.removedDexApiFile)
} }
} }