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

Merge "Disable boot jars package check if no boot jars have been configured" am: 99fc06f8ed

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

Change-Id: I41e7ff19607b3358b418782a50cf30e05bcb6f44
This commit is contained in:
Paul Duffin
2021-06-22 18:47:20 +00:00
committed by Automerger Merge Worker
parent e72d1c1c44 99fc06f8ed
commit 5a5f422c23
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/boot_jars.go
View File

@@ -31,13 +31,18 @@ func isActiveModule(module android.Module) bool {
// buildRuleForBootJarsPackageCheck generates the build rule to perform the boot jars package // buildRuleForBootJarsPackageCheck generates the build rule to perform the boot jars package
// check. // check.
func buildRuleForBootJarsPackageCheck(ctx android.ModuleContext, bootDexJarByModule bootDexJarByModule) { func buildRuleForBootJarsPackageCheck(ctx android.ModuleContext, bootDexJarByModule bootDexJarByModule) {
bootDexJars := bootDexJarByModule.bootDexJarsWithoutCoverage()
if len(bootDexJars) == 0 {
return
}
timestamp := android.PathForOutput(ctx, "boot-jars-package-check/stamp") timestamp := android.PathForOutput(ctx, "boot-jars-package-check/stamp")
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
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.bootDexJarsWithoutCoverage()). Inputs(bootDexJars).
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")