diff options
| author | 2024-09-10 19:33:04 +0000 | |
|---|---|---|
| committer | 2024-09-10 19:33:04 +0000 | |
| commit | dd46300414ffb5ea411cc2b642b87fcc47477123 (patch) | |
| tree | c10147c3ec518284b6c425d5a0caf432457bb2b9 /python/python.go | |
| parent | 864344a84f22b045850106590bb2c79f9b4078b6 (diff) | |
| parent | 4ce4f8893e5c5ee9b9b2669ceb36a01d85ea39f4 (diff) | |
Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main
Diffstat (limited to 'python/python.go')
| -rw-r--r-- | python/python.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/python/python.go b/python/python.go index 8726f02ef..01ac86c71 100644 --- a/python/python.go +++ b/python/python.go @@ -264,10 +264,9 @@ func (versionSplitTransitionMutator) Split(ctx android.BaseModuleContext) []stri variants = append(variants, pyVersion3) } if proptools.BoolDefault(props.Version.Py2.Enabled, false) { - if !ctx.DeviceConfig().BuildBrokenUsesSoongPython2Modules() && - ctx.ModuleName() != "py2-cmd" && + if ctx.ModuleName() != "py2-cmd" && ctx.ModuleName() != "py2-stdlib" { - ctx.PropertyErrorf("version.py2.enabled", "Python 2 is no longer supported, please convert to python 3. This error can be temporarily overridden by setting BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES := true in the product configuration") + ctx.PropertyErrorf("version.py2.enabled", "Python 2 is no longer supported, please convert to python 3.") } variants = append(variants, pyVersion2) } |