From 36242850fdad11b4e6fbe061ef30f62e7e8c08d8 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 23 Jun 2017 15:06:31 -0700 Subject: 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 --- python/binary.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'python/binary.go') 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 { -- cgit v1.2.3-59-g8ed1b