Refactor factories
Change module factories from returning a blueprint.Module and a list
of property structs to returning an android.Module, which holds the
list of property structs.
Test: build.ninja identical except for Factory: comment lines
Change-Id: Ica1d823f009db812c518f271a386fbff39c9766f
diff --git a/python/test.go b/python/test.go
index 8318438..837eb25 100644
--- a/python/test.go
+++ b/python/test.go
@@ -17,8 +17,6 @@
import (
"android/soong/android"
"path/filepath"
-
- "github.com/google/blueprint"
)
// This file contains the module types for building Python test.
@@ -42,13 +40,15 @@
p.pythonDecorator.baseInstaller.install(ctx, file)
}
-func PythonTestHostFactory() (blueprint.Module, []interface{}) {
+func PythonTestHostFactory() android.Module {
decorator := &pythonTestHostDecorator{
pythonDecorator: pythonDecorator{baseInstaller: NewPythonInstaller("nativetest")}}
module := &PythonBinaryHost{}
module.pythonBaseModule.installer = decorator
+ module.AddProperties(&module.binaryProperties)
+
return InitPythonBaseModule(&module.pythonBinaryBase.pythonBaseModule,
- &module.pythonBinaryBase, android.HostSupportedNoCross, &module.binaryProperties)
+ &module.pythonBinaryBase, android.HostSupportedNoCross)
}