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/library.go b/cc/library.go
index 2c5f22f..cb4dc61 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -20,7 +20,6 @@
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
- "android/soong"
"android/soong/android"
)
@@ -77,11 +76,11 @@
}
func init() {
- soong.RegisterModuleType("cc_library_static", libraryStaticFactory)
- soong.RegisterModuleType("cc_library_shared", librarySharedFactory)
- soong.RegisterModuleType("cc_library", libraryFactory)
- soong.RegisterModuleType("cc_library_host_static", libraryHostStaticFactory)
- soong.RegisterModuleType("cc_library_host_shared", libraryHostSharedFactory)
+ android.RegisterModuleType("cc_library_static", libraryStaticFactory)
+ android.RegisterModuleType("cc_library_shared", librarySharedFactory)
+ android.RegisterModuleType("cc_library", libraryFactory)
+ android.RegisterModuleType("cc_library_host_static", libraryHostStaticFactory)
+ android.RegisterModuleType("cc_library_host_shared", libraryHostSharedFactory)
}
// Module factory for combined static + shared libraries, device by default but with possible host