Revert "Change Python in Soong to support device side build."

This reverts commit 3bba05962d.

Reason for revert: <revert mac builds>

Change-Id: I25f1380573d69f7e111287624a2d4a3d95fdd86b
This commit is contained in:
Nan Zhang
2017-12-01 06:19:27 +00:00
parent 3bba05962d
commit 0a32e5936b
6 changed files with 16 additions and 57 deletions

View File

@@ -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