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

Revert "Fix python_binary_host module in mixed build."

Browse Source 
Revert submission 1861755-fix_python_binary_host_in_mixed_build

Reason for revert: Broke Bazel CI, please see https://android-build.googleplex.com/builds/submitted/7879108/mixed_droid-clean/latest/view/logs/build_error.log and https://android-build.googleplex.com/builds/submitted/7879108/mixed_droid-incremental/latest/view/logs/build_error.log
Reverted Changes:
Ica457ee71:Add platform needed by python_binary_host.
Ibc8b99a92:Fix python_binary_host module in mixed build.

Change-Id: I3d6c4f6edee2d00bdc78efd5cee64f4c915baeaa
This commit is contained in:
Rupert Shuttleworth
2021-11-03 09:07:26 +00:00
parent 664a4fd0af
commit ffc4cc41a3
6 changed files with 13 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/binary.go
View File

@@ -143,7 +143,7 @@ var (
func NewBinary(hod android.HostOrDeviceSupported) (*Module, *binaryDecorator) {
module := newModule(hod, android.MultilibFirst)
decorator := &binaryDecorator{pythonInstaller: NewPythonInstaller("bin", "", module)}
decorator := &binaryDecorator{pythonInstaller: NewPythonInstaller("bin", "")}
module.bootstrapper = decorator
module.installer = decorator

17
python/installer.go
View File

@@ -36,14 +36,12 @@ type pythonInstaller struct {
path android.InstallPath
androidMkSharedLibs []string
module *Module
}
func NewPythonInstaller(dir, dir64 string, module *Module) *pythonInstaller {
func NewPythonInstaller(dir, dir64 string) *pythonInstaller {
return &pythonInstaller{
dir: dir,
dir64: dir64,
module: module,
dir: dir,
dir64: dir64,
}
}
@@ -61,14 +59,7 @@ func (installer *pythonInstaller) installDir(ctx android.ModuleContext) android.
}
func (installer *pythonInstaller) install(ctx android.ModuleContext, file android.Path) {
if ctx.ModuleType() == "python_binary_host" && installer.module.MixedBuildsEnabled(ctx) {
label := installer.module.BazelModuleBase.GetBazelLabel(ctx, installer.module)
binary, _ := ctx.Config().BazelContext.GetPythonBinary(label, android.GetConfigKey(ctx))
bazelBinaryOutPath := android.PathForBazelOut(ctx, binary)
installer.path = ctx.InstallFile(installer.installDir(ctx), bazelBinaryOutPath.Base(), bazelBinaryOutPath)
} else {
installer.path = ctx.InstallFile(installer.installDir(ctx), file.Base(), file)
}
installer.path = ctx.InstallFile(installer.installDir(ctx), file.Base(), file)
}
func (installer *pythonInstaller) setAndroidMkSharedLibs(sharedLibs []string) {

2
python/test.go
View File

@@ -101,7 +101,7 @@ func (test *testDecorator) install(ctx android.ModuleContext, file android.Path)
func NewTest(hod android.HostOrDeviceSupported) *Module {
module, binary := NewBinary(hod)
binary.pythonInstaller = NewPythonInstaller("nativetest", "nativetest64", module)
binary.pythonInstaller = NewPythonInstaller("nativetest", "nativetest64")
test := &testDecorator{binaryDecorator: binary}
if hod == android.HostSupportedNoCross && test.testProperties.Test_options.Unit_test == nil {