Wrap panics that occur in AndroidMkDataProviders

am: 953d3a2b28 Change-Id: Ieecee223712e3968eb0ddad6c4d4cca5596da822
2018-09-06 19:56:25 -07:00 · 2018-09-06 19:56:25 -07:00 · f322c5f0ee
parent aae66fa8d2 953d3a2b28
commit f322c5f0ee
1 changed files with 7 additions and 0 deletions
--- a/android/androidmk.go
+++ b/android/androidmk.go
@ -141,6 +141,13 @@ func translateAndroidMk(ctx SingletonContext, mkFile string, mods []Module) erro
 }

 func translateAndroidMkModule(ctx SingletonContext, w io.Writer, mod blueprint.Module) error {
+	defer func() {
+		if r := recover(); r != nil {
+			panic(fmt.Errorf("%s in translateAndroidMkModule for module %s variant %s",
+				r, ctx.ModuleName(mod), ctx.ModuleSubDir(mod)))
+		}
+	}()
+
 	provider, ok := mod.(AndroidMkDataProvider)
 	if !ok {
 		return nil