summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-06-22 14:48:12 +0100
committer Paul Duffin <paulduffin@google.com> 2021-06-22 14:55:30 +0100
commit9ffbecc2c8e8a3705d922517b17c98db13d6cfcc (patch)
treeb2dc7efa2b803fcbc9dba43c3d2ca3db7d8aa0f1
parenta1a2baf8a7de22b8429ae638ff07ccb5e8f3dec9 (diff)
Disable boot jars package check if no boot jars have been configured
Some build configurations do not configure boot jars. In those cases the boot jars package check fails so should be skipped. Bug: 177892522 Test: m nothing lunch fvp_mini && m Change-Id: I5498a8f5cdfb2fabf5223e94dfcee0e853059d01
-rw-r--r--java/boot_jars.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/boot_jars.go b/java/boot_jars.go
index 86ebe36b4..5d40ec389 100644
--- a/java/boot_jars.go
+++ b/java/boot_jars.go
@@ -31,13 +31,18 @@ func isActiveModule(module android.Module) bool {
// buildRuleForBootJarsPackageCheck generates the build rule to perform the boot jars package
// check.
func buildRuleForBootJarsPackageCheck(ctx android.ModuleContext, bootDexJarByModule bootDexJarByModule) {
+ bootDexJars := bootDexJarByModule.bootDexJarsWithoutCoverage()
+ if len(bootDexJars) == 0 {
+ return
+ }
+
timestamp := android.PathForOutput(ctx, "boot-jars-package-check/stamp")
rule := android.NewRuleBuilder(pctx, ctx)
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.bootDexJarsWithoutCoverage()).
+ Inputs(bootDexJars).
Text("&& touch").Output(timestamp)
rule.Build("boot_jars_package_check", "check boot jar packages")