Remove error from AndroidMkData.Extra
It's never anything except nil, and it unnecessarily complicates
the implementations.
Test: m -j checkbuild
Change-Id: I8a117a86aa39aeb07d9d8d0686ef869c52784f19
diff --git a/android/androidmk.go b/android/androidmk.go
index 6197f59..d5ee045 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -45,9 +45,11 @@
Custom func(w io.Writer, name, prefix, moduleDir string) error
- Extra []func(w io.Writer, outputFile Path) error
+ Extra []AndroidMkExtraFunc
}
+type AndroidMkExtraFunc func(w io.Writer, outputFile Path)
+
func AndroidMkSingleton() blueprint.Singleton {
return &androidMkSingleton{}
}
@@ -255,10 +257,7 @@
}
for _, extra := range data.Extra {
- err = extra(w, data.OutputFile.Path())
- if err != nil {
- return err
- }
+ extra(w, data.OutputFile.Path())
}
fmt.Fprintln(w, "include $(BUILD_PREBUILT)")