From 4ce4f8893e5c5ee9b9b2669ceb36a01d85ea39f4 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 9 Sep 2024 18:08:49 -0700 Subject: Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES It's been available for over a year, lets progress the python3 migration by removing it. Bug: 203436762 Test: Presubmits Change-Id: I46a6477ec65e98b7e6df5cc1359f676dcbd0f08e --- python/python.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'python/python.go') 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) } -- cgit v1.2.3-59-g8ed1b