No matching variant android_app_import fix
This fixes a bug where android_app_import or android_test_import without a matching variant or a default apk property value breaks the build. Test: app_test.go Fixes: 152343232 Change-Id: I8215aa1a6dad74b503eaa1169a64f8c30dda287c
This commit is contained in:
@@ -1400,6 +1400,13 @@ func (a *AndroidAppImport) processVariants(ctx android.LoadHookContext) {
|
||||
archProps := reflect.ValueOf(a.archVariants).Elem().FieldByName("Arch")
|
||||
archType := ctx.Config().AndroidFirstDeviceTarget.Arch.ArchType
|
||||
MergePropertiesFromVariant(ctx, &a.properties, archProps, archType.Name)
|
||||
|
||||
if String(a.properties.Apk) == "" {
|
||||
// Disable this module since the apk property is still empty after processing all matching
|
||||
// variants. This likely means there is no matching variant, and the default variant doesn't
|
||||
// have an apk property value either.
|
||||
a.Disable()
|
||||
}
|
||||
}
|
||||
|
||||
func MergePropertiesFromVariant(ctx android.EarlyModuleContext,
|
||||
|
Reference in New Issue
Block a user