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
diff --git a/android/androidmk.go b/android/androidmk.go
index 469ac7f..8f9f3bc 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -150,10 +150,6 @@
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 @@
return nil
}
+ data, err := provider.AndroidMk()
+ if err != nil {
+ return err
+ }
+
if data.SubName != "" {
name += data.SubName
}