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

Merge "Skip dexbootjar check using AllowMissingDependencies flag" am: b7e5985fd5 am: ab47a767d8 am: 572842e09c am: e0eaa06d87 am: 716ecba7ea

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

Change-Id: Id970ee5cfb571ca78395ea66bfc5e23ff9df5fd2
This commit is contained in:
Spandan Das
2021-08-31 17:25:44 +00:00
committed by Automerger Merge Worker
parent d352d3eaf4 716ecba7ea
commit 841764eb92
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/dexpreopt_bootjars.go
View File

@@ -500,7 +500,11 @@ func copyBootJarsToPredefinedLocations(ctx android.ModuleContext, srcBootDexJars
dst := dstBootJarsByModule[name]
if src == nil {
ctx.ModuleErrorf("module %s does not provide a dex boot jar", name)
if !ctx.Config().AllowMissingDependencies() {
ctx.ModuleErrorf("module %s does not provide a dex boot jar", name)
} else {
ctx.AddMissingDependencies([]string{name})
}
} else if dst == nil {
ctx.ModuleErrorf("module %s is not part of the boot configuration", name)
} else {