Export cc library factories.
Previously not useful, they are required to use CreateModule
to create additional libraries.
Bug: 35570956
Test: manual :)
Change-Id: Ibb6b1c0d365512fce8969e1e6237ebbed0bc9cdc
diff --git a/cc/library.go b/cc/library.go
index 9d18017..5aac04b 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -109,51 +109,51 @@
}
func init() {
- 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)
- android.RegisterModuleType("cc_library_headers", libraryHeaderFactory)
+ 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)
+ android.RegisterModuleType("cc_library_headers", LibraryHeaderFactory)
}
// Module factory for combined static + shared libraries, device by default but with possible host
// support
-func libraryFactory() android.Module {
+func LibraryFactory() android.Module {
module, _ := NewLibrary(android.HostAndDeviceSupported)
return module.Init()
}
// Module factory for static libraries
-func libraryStaticFactory() android.Module {
+func LibraryStaticFactory() android.Module {
module, library := NewLibrary(android.HostAndDeviceSupported)
library.BuildOnlyStatic()
return module.Init()
}
// Module factory for shared libraries
-func librarySharedFactory() android.Module {
+func LibrarySharedFactory() android.Module {
module, library := NewLibrary(android.HostAndDeviceSupported)
library.BuildOnlyShared()
return module.Init()
}
// Module factory for host static libraries
-func libraryHostStaticFactory() android.Module {
+func LibraryHostStaticFactory() android.Module {
module, library := NewLibrary(android.HostSupported)
library.BuildOnlyStatic()
return module.Init()
}
// Module factory for host shared libraries
-func libraryHostSharedFactory() android.Module {
+func LibraryHostSharedFactory() android.Module {
module, library := NewLibrary(android.HostSupported)
library.BuildOnlyShared()
return module.Init()
}
// Module factory for header-only libraries
-func libraryHeaderFactory() android.Module {
+func LibraryHeaderFactory() android.Module {
module, library := NewLibrary(android.HostAndDeviceSupported)
library.HeaderOnly()
return module.Init()