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: I0326d0c88f78edb79eebedb155b69415e351fb61
diff --git a/build/art.go b/build/art.go
index b826538..1164cbc 100644
--- a/build/art.go
+++ b/build/art.go
@@ -15,7 +15,6 @@
package art
import (
- "android/soong"
"android/soong/android"
"android/soong/cc"
"fmt"
@@ -222,13 +221,13 @@
var artTestMutex sync.Mutex
func init() {
- soong.RegisterModuleType("art_cc_library", artLibrary)
- soong.RegisterModuleType("art_cc_binary", artBinary)
- soong.RegisterModuleType("art_cc_test", artTest)
- soong.RegisterModuleType("art_cc_test_library", artTestLibrary)
- soong.RegisterModuleType("art_cc_defaults", artDefaultsFactory)
- soong.RegisterModuleType("art_global_defaults", artGlobalDefaultsFactory)
- soong.RegisterModuleType("art_debug_defaults", artDebugDefaultsFactory)
+ android.RegisterModuleType("art_cc_library", artLibrary)
+ android.RegisterModuleType("art_cc_binary", artBinary)
+ android.RegisterModuleType("art_cc_test", artTest)
+ android.RegisterModuleType("art_cc_test_library", artTestLibrary)
+ android.RegisterModuleType("art_cc_defaults", artDefaultsFactory)
+ android.RegisterModuleType("art_global_defaults", artGlobalDefaultsFactory)
+ android.RegisterModuleType("art_debug_defaults", artDebugDefaultsFactory)
}
func artGlobalDefaultsFactory() (blueprint.Module, []interface{}) {