diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-12-01 20:00:31 +0000 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-12-01 20:00:31 +0000 |
| commit | d9ec5e7dea386f00594c43685eb25cdb6c0b6cba (patch) | |
| tree | 8ebc182125ea5934c824a583c07b123ffa1010f7 /python/binary.go | |
| parent | 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602 (diff) | |
| download | build_soong-d9ec5e7dea386f00594c43685eb25cdb6c0b6cba.tar.gz build_soong-d9ec5e7dea386f00594c43685eb25cdb6c0b6cba.tar.bz2 build_soong-d9ec5e7dea386f00594c43685eb25cdb6c0b6cba.zip | |
Revert "Revert "Change Python in Soong to support device side build.""
This reverts commit 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602.
Reason for revert: <libsqlite was missing for darwin_x86_64 before>
Change-Id: I2e13e849a503a705ffad425df292380f2f73954e
Diffstat (limited to 'python/binary.go')
| -rw-r--r-- | python/binary.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/python/binary.go b/python/binary.go index 14c49527..457c7fa0 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 |