Exclude jacocoagent from boot jars package check am: 7f8721618c (eaae5064) · Commits · e / os / android_build_soong

java/boot_jars.go

+1 −1

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -589,6 +589,19 @@ func (b bootDexJarByModule) bootDexJars() android.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.
		type HiddenAPIOutput struct {
		HiddenAPIFlagOutput