diff options
| author | Colin Cross <ccross@android.com> | 2017-06-23 15:06:31 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-06-30 21:08:36 +0000 |
| commit | 36242850fdad11b4e6fbe061ef30f62e7e8c08d8 (patch) | |
| tree | a3ca380533afd39e733c658560f87effb1ee0a46 /python/binary.go | |
| parent | 48173891485a22c9cab0e48f90a3a23be212f44a (diff) | |
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
Diffstat (limited to 'python/binary.go')
| -rw-r--r-- | python/binary.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/python/binary.go b/python/binary.go index 81e8bd944..ae2693b98 100644 --- a/python/binary.go +++ b/python/binary.go @@ -21,8 +21,6 @@ import ( "path/filepath" "strings" - "github.com/google/blueprint" - "android/soong/android" ) @@ -74,15 +72,16 @@ var ( stubTemplateHost = "build/soong/python/scripts/stub_template_host.txt" ) -func PythonBinaryHostFactory() (blueprint.Module, []interface{}) { +func PythonBinaryHostFactory() android.Module { decorator := &pythonBinaryHostDecorator{ pythonDecorator: pythonDecorator{baseInstaller: NewPythonInstaller("bin")}} 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) } func (p *pythonBinaryBase) GeneratePythonBuildActions(ctx android.ModuleContext) android.OptionalPath { |