Use blueprint DependencyTags
Blueprint now requres DependencyTags to be passed to AddDependency
calls. Use the tags to avoid setting member variables on modules, which
will be lost after the mutators have been called.
Change-Id: I8c1d9ed1db85a300e14394b911a516d361ba9f75
diff --git a/common/defaults.go b/common/defaults.go
index 693d510..030946b 100644
--- a/common/defaults.go
+++ b/common/defaults.go
@@ -19,6 +19,12 @@
"github.com/google/blueprint/proptools"
)
+type defaultsDependencyTag struct {
+ blueprint.BaseDependencyTag
+}
+
+var DefaultsDepTag defaultsDependencyTag
+
type defaultsProperties struct {
Defaults []string
}
@@ -105,7 +111,7 @@
func defaultsDepsMutator(ctx AndroidBottomUpMutatorContext) {
if defaultable, ok := ctx.Module().(Defaultable); ok {
- ctx.AddDependency(ctx.Module(), defaultable.defaults().Defaults...)
+ ctx.AddDependency(ctx.Module(), DefaultsDepTag, defaultable.defaults().Defaults...)
}
}