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/cc/test.go b/cc/test.go
index 9c7c0de..9cc30c9 100644
--- a/cc/test.go
+++ b/cc/test.go
@@ -21,7 +21,6 @@
"github.com/google/blueprint"
- "android/soong"
"android/soong/android"
)
@@ -37,11 +36,11 @@
}
func init() {
- soong.RegisterModuleType("cc_test", testFactory)
- soong.RegisterModuleType("cc_test_library", testLibraryFactory)
- soong.RegisterModuleType("cc_benchmark", benchmarkFactory)
- soong.RegisterModuleType("cc_test_host", testHostFactory)
- soong.RegisterModuleType("cc_benchmark_host", benchmarkHostFactory)
+ android.RegisterModuleType("cc_test", testFactory)
+ android.RegisterModuleType("cc_test_library", testLibraryFactory)
+ android.RegisterModuleType("cc_benchmark", benchmarkFactory)
+ android.RegisterModuleType("cc_test_host", testHostFactory)
+ android.RegisterModuleType("cc_benchmark_host", benchmarkHostFactory)
}
// Module factory for tests