diff options
author | Colin Cross <ccross@android.com> | 2017-06-30 23:04:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-30 23:04:04 +0000 |
commit | 2f3933bf7a5727fca536cfd0a96d13453827d749 (patch) | |
tree | bb3581fd21c2a064fa002b2b2e28b971d757bdc9 | |
parent | 1d73979cf0ba2cd2e43428f6c4790c1371422b6b (diff) | |
parent | 2adbb1b0db92a1dc56de6fe2d6c83025b6224aa7 (diff) | |
download | llvm-2f3933bf7a5727fca536cfd0a96d13453827d749.tar.gz |
Merge "Refactor module registration" am: 8cdd9f59ff am: b92ee537d0
am: 2adbb1b0db
Change-Id: Iadb21a08bfa5bfbabe66cf6f563acda580c4e9ff
-rw-r--r-- | soong/llvm.go | 13 | ||||
-rw-r--r-- | soong/tblgen.go | 7 |
2 files changed, 10 insertions, 10 deletions
diff --git a/soong/llvm.go b/soong/llvm.go index ac096e6ff452..7ff99bdb6798 100644 --- a/soong/llvm.go +++ b/soong/llvm.go @@ -18,7 +18,6 @@ import ( "android/soong/android" "android/soong/cc" - "github.com/google/blueprint" "github.com/google/blueprint/proptools" ) @@ -102,15 +101,15 @@ func init() { android.RegisterModuleType("force_build_llvm_components_defaults", forceBuildLlvmComponentsDefaultsFactory) } -func llvmDefaultsFactory() (blueprint.Module, []interface{}) { - module, props := cc.DefaultsFactory() +func llvmDefaultsFactory() android.Module { + module := cc.DefaultsFactory() android.AddLoadHook(module, llvmDefaults) - return module, props + return module } -func forceBuildLlvmComponentsDefaultsFactory() (blueprint.Module, []interface{}) { - module, props := cc.DefaultsFactory() +func forceBuildLlvmComponentsDefaultsFactory() android.Module { + module := cc.DefaultsFactory() android.AddLoadHook(module, forceBuildLlvmComponents) - return module, props + return module } diff --git a/soong/tblgen.go b/soong/tblgen.go index aee3240e3dc4..ac7a34389066 100644 --- a/soong/tblgen.go +++ b/soong/tblgen.go @@ -147,8 +147,9 @@ func (t *tblgen) GeneratedSourceFiles() android.Paths { return t.generatedHeaders } -func llvmTblgenFactory() (blueprint.Module, []interface{}) { +func llvmTblgenFactory() android.Module { t := &tblgen{} - - return android.InitAndroidModule(t, &t.properties) + t.AddProperties(&t.properties) + android.InitAndroidModule(t) + return t } |