Remove boolean arguments from NewLibrary()
NewLibrary is going to be used for header only libraries. Instead
of adding more boolean arguments, replace the existing ones with
BuildOnlyStatic and BuildOnlyShared calls on the libraryDecorator
returned by NewLibrary.
Test: m -j, compare build.ninja
Change-Id: Id390b66cbf2a5f0932b32f40a5e18eb9e3852ee7
diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go
index 46b383b..63f8921 100644
--- a/cc/ndk_prebuilt.go
+++ b/cc/ndk_prebuilt.go
@@ -102,7 +102,8 @@
}
func ndkPrebuiltLibraryFactory() (blueprint.Module, []interface{}) {
- module, library := NewLibrary(android.DeviceSupported, true, false)
+ module, library := NewLibrary(android.DeviceSupported)
+ library.BuildOnlyShared()
linker := &ndkPrebuiltLibraryLinker{
libraryDecorator: library,
}
@@ -132,7 +133,8 @@
}
func ndkPrebuiltSharedStlFactory() (blueprint.Module, []interface{}) {
- module, library := NewLibrary(android.DeviceSupported, true, false)
+ module, library := NewLibrary(android.DeviceSupported)
+ library.BuildOnlyShared()
linker := &ndkPrebuiltStlLinker{
ndkPrebuiltLibraryLinker: ndkPrebuiltLibraryLinker{
libraryDecorator: library,
@@ -146,7 +148,8 @@
}
func ndkPrebuiltStaticStlFactory() (blueprint.Module, []interface{}) {
- module, library := NewLibrary(android.DeviceSupported, false, true)
+ module, library := NewLibrary(android.DeviceSupported)
+ library.BuildOnlyStatic()
linker := &ndkPrebuiltStlLinker{
ndkPrebuiltLibraryLinker: ndkPrebuiltLibraryLinker{
libraryDecorator: library,