Move registration into android package
Mutator registration is tightly coupled with the android package, move
all registration from the soong package to the android package.
Test: build.ninja identical
Change-Id: Ie183d0b52cc7431c9e05b231934d189208ef1efe
diff --git a/android/makevars.go b/android/makevars.go
index e431f11..482fbde 100644
--- a/android/makevars.go
+++ b/android/makevars.go
@@ -20,8 +20,6 @@
"io/ioutil"
"os"
- "android/soong"
-
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
)
@@ -66,7 +64,7 @@
///////////////////////////////////////////////////////////////////////////////
func init() {
- soong.RegisterSingletonType("makevars", makeVarsSingletonFunc)
+ RegisterSingletonType("makevars", makeVarsSingletonFunc)
}
func makeVarsSingletonFunc() blueprint.Singleton {