From cc4f3e3f94b9f7cc2a6cf66e6a7e0e697bfd0d28 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 23 Nov 2016 15:41:09 -0800 Subject: [PATCH] Don't generate Android.mk data if the module is disabled Move the calls to the AndroidMkProvider to after checking if the module is disabled. Disabled modules may not have all the state necessary to generate the data. Test: m -j libLLVM Change-Id: Iab27a26e604f3810bcc2d9f61b1839aa7bc428b4 --- android/androidmk.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/android/androidmk.go b/android/androidmk.go index 469ac7ff3..8f9f3bcd2 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -150,10 +150,6 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b name := provider.BaseModuleName() amod := mod.(Module).base() - data, err := provider.AndroidMk() - if err != nil { - return err - } if !amod.Enabled() { return nil @@ -163,6 +159,11 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b return nil } + data, err := provider.AndroidMk() + if err != nil { + return err + } + if data.SubName != "" { name += data.SubName }