From d9ec5e7dea386f00594c43685eb25cdb6c0b6cba Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Fri, 1 Dec 2017 20:00:31 +0000 Subject: Revert "Revert "Change Python in Soong to support device side build."" This reverts commit 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602. Reason for revert: Change-Id: I2e13e849a503a705ffad425df292380f2f73954e --- python/binary.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'python/binary.go') diff --git a/python/binary.go b/python/binary.go index 14c495278..457c7fa0a 100644 --- a/python/binary.go +++ b/python/binary.go @@ -49,24 +49,20 @@ type BinaryProperties struct { type binaryDecorator struct { binaryProperties BinaryProperties - baseInstaller *pythonInstaller + *pythonInstaller } type IntermPathProvider interface { IntermPathForModuleOut() android.OptionalPath } -func (binary *binaryDecorator) install(ctx android.ModuleContext, file android.Path) { - binary.baseInstaller.install(ctx, file) -} - var ( stubTemplateHost = "build/soong/python/scripts/stub_template_host.txt" ) func NewBinary(hod android.HostOrDeviceSupported) (*Module, *binaryDecorator) { module := newModule(hod, android.MultilibFirst) - decorator := &binaryDecorator{baseInstaller: NewPythonInstaller("bin")} + decorator := &binaryDecorator{pythonInstaller: NewPythonInstaller("bin", "")} module.bootstrapper = decorator module.installer = decorator -- cgit v1.2.3-59-g8ed1b