diff options
| author | 2021-10-07 06:26:48 +0000 | |
|---|---|---|
| committer | 2021-11-02 17:04:38 +0000 | |
| commit | 664a4fd0afde4ff4359022f5c23e6fcb6f08aa16 (patch) | |
| tree | 4e279d21e17e787d43877f3265b720412b2bc538 /python/installer.go | |
| parent | c7a4de25c100e0c3e24186c5f2b4c9e959e928bc (diff) | |
Fix python_binary_host module in mixed build.
Test: USE_BAZEL_ANALYSIS=1 m genfunctosyscallnrs
Test: USE_BAZEL_ANALYSIS=1 m func_to_syscall_nrs
Test: USE_BAZEL_ANALYSIS=1 m libseccomp_policy
Bug: 201094425, 197135289
Change-Id: Ibc8b99a92149410c8a879b7a4facf6c8961a7b9f
Diffstat (limited to 'python/installer.go')
| -rw-r--r-- | python/installer.go | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/python/installer.go b/python/installer.go index 396f03667..515cc47f2 100644 --- a/python/installer.go +++ b/python/installer.go @@ -36,12 +36,14 @@ type pythonInstaller struct { path android.InstallPath androidMkSharedLibs []string + module *Module } -func NewPythonInstaller(dir, dir64 string) *pythonInstaller { +func NewPythonInstaller(dir, dir64 string, module *Module) *pythonInstaller { return &pythonInstaller{ - dir: dir, - dir64: dir64, + dir: dir, + dir64: dir64, + module: module, } } @@ -59,7 +61,14 @@ func (installer *pythonInstaller) installDir(ctx android.ModuleContext) android. } func (installer *pythonInstaller) install(ctx android.ModuleContext, file android.Path) { - installer.path = ctx.InstallFile(installer.installDir(ctx), file.Base(), file) + 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) + } } func (installer *pythonInstaller) setAndroidMkSharedLibs(sharedLibs []string) { |