Merge "Skip dexbootjar check using AllowMissingDependencies flag" am: b7e5985fd5
am: ab47a767d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803934 Change-Id: Ifbe1f13e777e059fe24080d716cf0b10ae703b33
This commit is contained in:
@@ -4979,6 +4979,12 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
|
||||
// find the dex boot jar in it. We either need to disable the source libfoo
|
||||
// or make the prebuilt libfoo preferred.
|
||||
testDexpreoptWithApexes(t, bp, "module libfoo does not provide a dex boot jar", preparer, fragment)
|
||||
// dexbootjar check is skipped if AllowMissingDependencies is true
|
||||
preparerAllowMissingDeps := android.GroupFixturePreparers(
|
||||
preparer,
|
||||
android.PrepareForTestWithAllowMissingDependencies,
|
||||
)
|
||||
testDexpreoptWithApexes(t, bp, "", preparerAllowMissingDeps, fragment)
|
||||
})
|
||||
|
||||
t.Run("prebuilt library preferred with source", func(t *testing.T) {
|
||||
|
@@ -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 {
|
||||
|
Reference in New Issue
Block a user