summaryrefslogtreecommitdiff
path: root/python/binary.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2025-01-31 10:54:46 -0800
committer Cole Faust <colefaust@google.com> 2025-01-31 10:54:46 -0800
commitd85c6771d7493ea0d3798174a03c25591050f80c (patch)
treec290d8d7426ab7aba463924a620e5abd9d20e023 /python/binary.go
parentd015ce2e687d5b7d56fe55e657cd5e6d68c7b737 (diff)
Remove python2 support from soong rules
Python2 has been removed from the android build. Removing the python version transition mutator should lead to some slight analysis time performance improvements. I also made embedded_launcher in base_properties no longer blueprint:"mutated", so that we can migrate usages to the main property struct and remove the `version` property struct. Many python tests were not being run due to a `if d.desc != "module with duplicate runfile path" { continue }` line, I removed that and fixed the tests. I also removed the test for an error when there are no source files, because that check has been relaxed since, and I think it's legitimate to have a python library that only has data files, not source files. And there are some of those libraries in the source tree. Bug: 203436762 Test: m nothing --no-skip-soong-tests Change-Id: Idf18e39233418237ecc83f70f65d83d4ea496633
Diffstat (limited to 'python/binary.go')
-rw-r--r--python/binary.go21
1 files changed, 2 insertions, 19 deletions
diff --git a/python/binary.go b/python/binary.go
index a3acb347d..4d6e11816 100644
--- a/python/binary.go
+++ b/python/binary.go
@@ -23,6 +23,7 @@ import (
"android/soong/android"
"android/soong/cc"
+
"github.com/google/blueprint"
)
@@ -143,8 +144,7 @@ func (p *PythonBinaryModule) buildBinary(ctx android.ModuleContext) {
}
srcsZips = append(srcsZips, depsSrcsZips...)
p.installSource = registerBuildActionForParFile(ctx, embeddedLauncher, launcherPath,
- p.getHostInterpreterName(ctx, p.properties.Actual_version),
- main, p.getStem(ctx), srcsZips)
+ "python3", main, p.getStem(ctx), srcsZips)
var sharedLibs []string
// if embedded launcher is enabled, we need to collect the shared library dependencies of the
@@ -205,23 +205,6 @@ func (b *PythonBinaryModule) autorun() bool {
return BoolDefault(b.binaryProperties.Autorun, true)
}
-// get host interpreter name.
-func (p *PythonBinaryModule) getHostInterpreterName(ctx android.ModuleContext,
- actualVersion string) string {
- var interp string
- switch actualVersion {
- case pyVersion2:
- interp = "python2.7"
- case pyVersion3:
- interp = "python3"
- default:
- panic(fmt.Errorf("unknown Python actualVersion: %q for module: %q.",
- actualVersion, ctx.ModuleName()))
- }
-
- return interp
-}
-
// find main program path within runfiles tree.
func (p *PythonBinaryModule) getPyMainFile(ctx android.ModuleContext,
srcsPathMappings []pathMapping) string {