StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

31
python/installer.go
View File

@@ -15,47 +15,26 @@
package python
import (
"path/filepath"
"android/soong/android"
)
// This file handles installing python executables into their final location
type installLocation int
const (
InstallInData installLocation = iota
)
type pythonInstaller struct {
dir string
dir64 string
relative string
dir string
path android.OutputPath
}
func NewPythonInstaller(dir, dir64 string) *pythonInstaller {
func NewPythonInstaller(dir string) *pythonInstaller {
return &pythonInstaller{
dir: dir,
dir64: dir64,
dir: dir,
}
}
var _ installer = (*pythonInstaller)(nil)
func (installer *pythonInstaller) installDir(ctx android.ModuleContext) android.OutputPath {
dir := installer.dir
if ctx.Arch().ArchType.Multilib == "lib64" && installer.dir64 != "" {
dir = installer.dir64
}
if !ctx.Host() && !ctx.Arch().Native {
dir = filepath.Join(dir, ctx.Arch().ArchType.String())
}
return android.PathForModuleInstall(ctx, dir, installer.relative)
}
func (installer *pythonInstaller) install(ctx android.ModuleContext, file android.Path) {
installer.path = ctx.InstallFile(installer.installDir(ctx), file.Base(), file)
installer.path = ctx.InstallFile(android.PathForModuleInstall(ctx, installer.dir),
file.Base(), file)
}