aboutsummaryrefslogtreecommitdiffstats
path: root/android/makevars.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-10-12 14:28:16 -0700
committerColin Cross <ccross@android.com>2016-10-12 14:30:44 -0700
commit798bfce9d00217716eaee2256878db625b9e6e2e (patch)
tree80939327c1f981ae0c689c907b37f8fb39334a99 /android/makevars.go
parent3f9bde87fb7f7da0ee41ff5674efee6177c88822 (diff)
downloadbuild_soong-798bfce9d00217716eaee2256878db625b9e6e2e.tar.gz
build_soong-798bfce9d00217716eaee2256878db625b9e6e2e.tar.bz2
build_soong-798bfce9d00217716eaee2256878db625b9e6e2e.zip
Move registration into android packageandroid-n-mr1-preview-2android-n-mr1-preview-1
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
Diffstat (limited to 'android/makevars.go')
-rw-r--r--android/makevars.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/android/makevars.go b/android/makevars.go
index e431f116..482fbdea 100644
--- a/android/makevars.go
+++ b/android/makevars.go
@@ -20,8 +20,6 @@ import (
"io/ioutil"
"os"
- "android/soong"
-
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
)
@@ -66,7 +64,7 @@ func RegisterMakeVarsProvider(pctx blueprint.PackageContext, provider MakeVarsPr
///////////////////////////////////////////////////////////////////////////////
func init() {
- soong.RegisterSingletonType("makevars", makeVarsSingletonFunc)
+ RegisterSingletonType("makevars", makeVarsSingletonFunc)
}
func makeVarsSingletonFunc() blueprint.Singleton {