From 44fc5bf548f91b2fc85e5a47e3bc744124e074d0 Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Tue, 30 Jul 2024 16:11:59 +0000 Subject: [PATCH] Handle missing dependencies in ravenwood.go This otherwise causes a crash when attempting any build on macOS. Test: build on macOS Change-Id: Ib69160cd798091ae5f45416f332a0ea9927e1e50 --- java/ravenwood.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java/ravenwood.go b/java/ravenwood.go index 84c285cc7..a52f4053f 100644 --- a/java/ravenwood.go +++ b/java/ravenwood.go @@ -285,6 +285,14 @@ func (r *ravenwoodLibgroup) GenerateAndroidBuildActions(ctx android.ModuleContex installPath := android.PathForModuleInstall(ctx, r.BaseModuleName()) for _, lib := range r.ravenwoodLibgroupProperties.Libs { libModule := ctx.GetDirectDepWithTag(lib, ravenwoodLibContentTag) + if libModule == nil { + if ctx.Config().AllowMissingDependencies() { + ctx.AddMissingDependencies([]string{lib}) + } else { + ctx.PropertyErrorf("lib", "missing dependency %q", lib) + } + continue + } libJar := android.OutputFileForModule(ctx, libModule, "") ctx.InstallFile(installPath, lib+".jar", libJar) }