diff options
Diffstat (limited to 'cc/ndk_prebuilt.go')
-rw-r--r-- | cc/ndk_prebuilt.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go index 15a9d288..13424e3c 100644 --- a/cc/ndk_prebuilt.go +++ b/cc/ndk_prebuilt.go @@ -18,8 +18,6 @@ import ( "fmt" "strings" - "github.com/google/blueprint" - "android/soong/android" "android/soong/cc/config" ) @@ -67,7 +65,7 @@ func (*ndkPrebuiltObjectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { return deps } -func ndkPrebuiltObjectFactory() (blueprint.Module, []interface{}) { +func ndkPrebuiltObjectFactory() android.Module { module := newBaseModule(android.DeviceSupported, android.MultilibBoth) module.linker = &ndkPrebuiltObjectLinker{ objectLinker: objectLinker{ @@ -101,7 +99,7 @@ func (*ndkPrebuiltLibraryLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { return deps } -func ndkPrebuiltLibraryFactory() (blueprint.Module, []interface{}) { +func ndkPrebuiltLibraryFactory() android.Module { module, library := NewLibrary(android.DeviceSupported) library.BuildOnlyShared() linker := &ndkPrebuiltLibraryLinker{ @@ -132,7 +130,7 @@ type ndkPrebuiltStlLinker struct { ndkPrebuiltLibraryLinker } -func ndkPrebuiltSharedStlFactory() (blueprint.Module, []interface{}) { +func ndkPrebuiltSharedStlFactory() android.Module { module, library := NewLibrary(android.DeviceSupported) library.BuildOnlyShared() linker := &ndkPrebuiltStlLinker{ @@ -147,7 +145,7 @@ func ndkPrebuiltSharedStlFactory() (blueprint.Module, []interface{}) { return module.Init() } -func ndkPrebuiltStaticStlFactory() (blueprint.Module, []interface{}) { +func ndkPrebuiltStaticStlFactory() android.Module { module, library := NewLibrary(android.DeviceSupported) library.BuildOnlyStatic() linker := &ndkPrebuiltStlLinker{ |