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

Merge "Handle missing dependencies in ravenwood.go" into main am: 6524e1d51c

Browse Source 
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>
This commit is contained in:
Jerome Gaillard
2024-07-31 11:16:23 +00:00
committed by Automerger Merge Worker
parent 8ef4e9e053 6524e1d51c
commit 14fe8f808b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/ravenwood.go
View File

@@ -285,6 +285,14 @@ func (r *ravenwoodLibgroup) GenerateAndroidBuildActions(ctx android.ModuleContex
installPath := android.PathForModuleInstall(ctx, r.BaseModuleName()) installPath := android.PathForModuleInstall(ctx, r.BaseModuleName())
for _, lib := range r.ravenwoodLibgroupProperties.Libs { for _, lib := range r.ravenwoodLibgroupProperties.Libs {
libModule := ctx.GetDirectDepWithTag(lib, ravenwoodLibContentTag) 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, "") libJar := android.OutputFileForModule(ctx, libModule, "")
ctx.InstallFile(installPath, lib+".jar", libJar) ctx.InstallFile(installPath, lib+".jar", libJar)
} }