Merge "Fix string concatenation error" am: 9d98ac15bb

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

Change-Id: Ieabd5925353386d26f5e1359cb3d97135cdbf672
This commit is contained in:
Treehugger Robot
2020-07-12 23:22:05 +00:00
committed by Automerger Merge Worker

View File

@@ -911,7 +911,7 @@ func newOsTypeSpecificInfo(ctx android.SdkMemberContext, osType android.OsType,
if commonVariants, ok := variantsByArchName["common"]; ok {
if len(osTypeVariants) != 1 {
panic("Expected to only have 1 variant when arch type is common but found " + string(len(osTypeVariants)))
panic(fmt.Errorf("Expected to only have 1 variant when arch type is common but found %d", len(osTypeVariants)))
}
// A common arch type only has one variant and its properties should be treated