From 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Fri, 1 Dec 2017 06:19:27 +0000 Subject: Revert "Change Python in Soong to support device side build." This reverts commit 3bba05962dc4329c6e3d28544775db591574ba7b. Reason for revert: Change-Id: I25f1380573d69f7e111287624a2d4a3d95fdd86b --- python/binary.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'python/binary.go') diff --git a/python/binary.go b/python/binary.go index 457c7fa0a..14c495278 100644 --- a/python/binary.go +++ b/python/binary.go @@ -49,20 +49,24 @@ type BinaryProperties struct { type binaryDecorator struct { binaryProperties BinaryProperties - *pythonInstaller + baseInstaller *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{pythonInstaller: NewPythonInstaller("bin", "")} + decorator := &binaryDecorator{baseInstaller: NewPythonInstaller("bin")} module.bootstrapper = decorator module.installer = decorator -- cgit v1.2.3-59-g8ed1b