diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-12-01 06:19:27 +0000 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-12-01 06:19:27 +0000 |
| commit | 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602 (patch) | |
| tree | b614604c99116d2f0b66a6894cc4bce74e001613 /python/binary.go | |
| parent | 3bba05962dc4329c6e3d28544775db591574ba7b (diff) | |
| download | android_build_soong-0a32e5936b4c87bc705d06fa2d4f6fed1f58d602.tar.gz android_build_soong-0a32e5936b4c87bc705d06fa2d4f6fed1f58d602.tar.bz2 android_build_soong-0a32e5936b4c87bc705d06fa2d4f6fed1f58d602.zip | |
Revert "Change Python in Soong to support device side build."
This reverts commit 3bba05962dc4329c6e3d28544775db591574ba7b.
Reason for revert: <revert mac builds>
Change-Id: I25f1380573d69f7e111287624a2d4a3d95fdd86b
Diffstat (limited to 'python/binary.go')
| -rw-r--r-- | python/binary.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/python/binary.go b/python/binary.go index 457c7fa0..14c49527 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 |