openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove panics from reportMissingVariationDependency" am: a75af16878 am: b49dae2874 

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

Change-Id: Ie70916fa9d33bf32e9e6bd41506e07d7a721e391
This commit is contained in:
Paul Duffin 2021-04-27 17:41:55 +00:00 committed by Automerger Merge Worker
parent 2a1eb2b563 b49dae2874
commit 539a24e1d0
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/bootclasspath.go
View File

@ -15,9 +15,8 @@
package java
import (
"fmt"
"android/soong/android"
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
)
@ -116,15 +115,7 @@ func addDependencyOntoApexModulePair(ctx android.BottomUpMutatorContext, apex st
// reportMissingVariationDependency intentionally adds a dependency on a missing variation in order
// to generate an appropriate error message with information about the available variations.
func reportMissingVariationDependency(ctx android.BottomUpMutatorContext, variations []blueprint.Variation, name string) {
modules := ctx.AddFarVariationDependencies(variations, nil, name)
if len(modules) != 1 {
panic(fmt.Errorf("Internal Error: expected one module, found %d", len(modules)))
return
}
if modules[0] != nil {
panic(fmt.Errorf("Internal Error: expected module to be missing but was found: %q", modules[0]))
return
}
ctx.AddFarVariationDependencies(variations, nil, name)
}
// ApexVariantReference specifies a particular apex variant of a module.