summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Jerome Gaillard <jgaillard@google.com> 2024-07-31 11:16:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-07-31 11:16:23 +0000
commit14fe8f808bb35f5dd7565bbbfdd2865019a497cf (patch)
treef6eb8354114309c9bd301c47c7ba3ff5ccbcd44f /java
parent8ef4e9e053f3754e243b95a2240e51c6445e9206 (diff)
parent6524e1d51c8290fc12ae81b668d417971763942a (diff)
Merge "Handle missing dependencies in ravenwood.go" into main am: 6524e1d51c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199471 Change-Id: I725805e93b8a3827f7697944f5fba603dc7c9f5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
-rw-r--r--java/ravenwood.go8
1 files changed, 8 insertions, 0 deletions
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)
}