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

Exclude jacocoagent from boot jars package check am: 7f8721618c

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

Change-Id: I83ba8899b202dd89ee613543eead69ab1f88ac4c
This commit is contained in:
Paul Duffin
2021-06-17 20:37:45 +00:00
committed by Automerger Merge Worker
parent 55e9321255 7f8721618c
commit eaae506467
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/boot_jars.go
View File

@@ -37,7 +37,7 @@ func buildRuleForBootJarsPackageCheck(ctx android.ModuleContext, bootDexJarByMod
rule.Command().BuiltTool("check_boot_jars"). rule.Command().BuiltTool("check_boot_jars").
Input(ctx.Config().HostToolPath(ctx, "dexdump")). Input(ctx.Config().HostToolPath(ctx, "dexdump")).
Input(android.PathForSource(ctx, "build/soong/scripts/check_boot_jars/package_allowed_list.txt")). Input(android.PathForSource(ctx, "build/soong/scripts/check_boot_jars/package_allowed_list.txt")).
Inputs(bootDexJarByModule.bootDexJars()). Inputs(bootDexJarByModule.bootDexJarsWithoutCoverage()).
Text("&& touch").Output(timestamp) Text("&& touch").Output(timestamp)
rule.Build("boot_jars_package_check", "check boot jar packages") rule.Build("boot_jars_package_check", "check boot jar packages")

13
java/hiddenapi_modular.go
View File

@@ -589,6 +589,19 @@ func (b bootDexJarByModule) bootDexJars() android.Paths {
return paths return paths
} }
// bootDexJarsWithoutCoverage returns the boot dex jar paths sorted by their keys without coverage
// libraries if present.
func (b bootDexJarByModule) bootDexJarsWithoutCoverage() android.Paths {
paths := android.Paths{}
for _, k := range android.SortedStringKeys(b) {
if k == "jacocoagent" {
continue
}
paths = append(paths, b[k])
}
return paths
}
// HiddenAPIOutput encapsulates the output from the hidden API processing. // HiddenAPIOutput encapsulates the output from the hidden API processing.
type HiddenAPIOutput struct { type HiddenAPIOutput struct {
HiddenAPIFlagOutput HiddenAPIFlagOutput